summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--src/Propellor/DotDir.hs2
3 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 74045c76..9268d51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
propellor (3.1.2) UNRELEASED; urgency=medium
+ [ Joey Hess ]
* Ssh.knownHost: Bug fix: Only fix up the owner of the known_hosts
file after it exists.
* Sbuild.keypairInsecurelyGenerated: Improved to be more robust.
Thanks, Sean Whitton.
+ [ Sean Whitton ]
+ * Pass --allow-unrelated-histories to git merge.
+ This fixes the /usr/bin/propellor wrapper for git 2.9.x.
+ - Propellor now requires git to be at least version 2.9.
+
-- Joey Hess <id@joeyh.name> Sun, 24 Jul 2016 13:34:37 -0400
propellor (3.1.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 9194b6c2..21a524d0 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-stm-dev,
libghc-text-dev,
libghc-concurrent-output-dev,
- git,
+ git (>= 1:2.9),
make,
Description: property-based host configuration management in haskell
Propellor ensures that the system it's run in satisfies a list of
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