diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-08 12:46:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-08 12:46:15 -0400 |
| commit | 8c61246c6877afee56e39463aebf37844078027a (patch) | |
| tree | d8537cb9d4a88d39d02b89d465821237693d13bb | |
| parent | ce72affe90166ab6658d0f7ccb5bc4942c401ef2 (diff) | |
Fix git version that supported --no-gpg-sign.
This is weird, git describe said the commit landed in 1.8.5, but 1.9.3 does
not have it on OSX. Assume 2.0.0.
| -rw-r--r-- | Git/Branch.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Git/Branch.hs b/Git/Branch.hs index 3f2496ca3..0b7d888b8 100644 --- a/Git/Branch.hs +++ b/Git/Branch.hs @@ -113,7 +113,7 @@ data CommitMode = ManualCommit | AutomaticCommit applyCommitMode :: CommitMode -> [CommandParam] -> [CommandParam] applyCommitMode commitmode ps - | commitmode == AutomaticCommit && not (Git.BuildVersion.older "1.8.5") = + | commitmode == AutomaticCommit && not (Git.BuildVersion.older "2.0.0") = Param "--no-gpg-sign" : ps | otherwise = ps diff --git a/debian/changelog b/debian/changelog index 7057501fa..39ce9ca11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (5.20140708) UNRELEASED; urgency=medium + + * Fix git version that supported --no-gpg-sign. + + -- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400 + git-annex (5.20140707) unstable; urgency=medium * assistant: Fix bug, introduced in last release, that caused the assistant |