diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-20 08:33:20 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-08-20 14:52:23 -0400 |
| commit | 845d9de7ab790a1691237c8f3b7a6bf8787b3489 (patch) | |
| tree | 621987633d74e720cb54754605e537128aee9ceb /debian | |
| parent | 5020a86907ade611324c66c82cf4ee074789bdd5 (diff) | |
pass --allow-unrelated-histories to git merge
Fixes merging the /usr/src/propellor git bundle with git 2.9.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 7 insertions, 1 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 |