mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix git version that supported --no-gpg-sign.

Browse source 
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.
This commit is contained in:
Joey Hess 2014-07-08 12:46:15 -04:00
parent eb015a1c96
commit eef8e8c51a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Git/Branch.hs
View file

@ -113,7 +113,7 @@ data CommitMode = ManualCommit | AutomaticCommit
applyCommitMode :: CommitMode -> [CommandParam] -> [CommandParam] applyCommitMode :: CommitMode -> [CommandParam] -> [CommandParam]
applyCommitMode commitmode ps 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 Param "--no-gpg-sign" : ps
| otherwise = ps | otherwise = ps

6
debian/changelog vendored
View file

@ -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 git-annex (5.20140707) unstable; urgency=medium
* assistant: Fix bug, introduced in last release, that caused the assistant * assistant: Fix bug, introduced in last release, that caused the assistant