From 845d9de7ab790a1691237c8f3b7a6bf8787b3489 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 20 Aug 2016 08:33:20 -0700 Subject: pass --allow-unrelated-histories to git merge Fixes merging the /usr/src/propellor git bundle with git 2.9. --- src/Propellor/DotDir.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs index c73420b0..cd079bca 100644 --- a/src/Propellor/DotDir.hs +++ b/src/Propellor/DotDir.hs @@ -401,7 +401,7 @@ setupUpstreamMaster newref = do changeWorkingDirectory tmprepo git ["fetch", distrepo, "--quiet"] git ["reset", "--hard", oldref, "--quiet"] - git ["merge", newref, "-s", "recursive", "-Xtheirs", "--quiet", "-m", "merging upstream version"] + git ["merge", newref, "-s", "recursive", "-Xtheirs", "--quiet", "--allow-unrelated-histories", "-m", "merging upstream version"] void $ fetchUpstreamBranch tmprepo cleantmprepo -- cgit v1.2.3