summaryrefslogtreecommitdiff
path: root/src/Propellor/DotDir.hs
diff options
context:
space:
mode:
authorSean Whitton2016-08-20 08:33:20 -0700
committerJoey Hess2016-08-20 14:52:23 -0400
commit845d9de7ab790a1691237c8f3b7a6bf8787b3489 (patch)
tree621987633d74e720cb54754605e537128aee9ceb /src/Propellor/DotDir.hs
parent5020a86907ade611324c66c82cf4ee074789bdd5 (diff)
pass --allow-unrelated-histories to git merge
Fixes merging the /usr/src/propellor git bundle with git 2.9.
Diffstat (limited to 'src/Propellor/DotDir.hs')
-rw-r--r--src/Propellor/DotDir.hs2
1 files changed, 1 insertions, 1 deletions
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