assistant: Work around misfeature in git 1.8.2 that makes git commit --alow-empty -m ""
run an editor.
See http://git-annex.branchable.com/bugs/assistant_hangs_during_commit/
This commit is contained in:
parent
1f430a9a43
commit
090a69f00c
2 changed files with 15 additions and 4 deletions
|
@ -175,10 +175,14 @@ commitStaged = do
|
|||
return True
|
||||
where
|
||||
nomessage ps
|
||||
| Git.Version.older "1.7.2" = Param "-m"
|
||||
: Param "autocommit" : ps
|
||||
| otherwise = Param "--allow-empty-message"
|
||||
: Param "-m" : Param "" : ps
|
||||
| Git.Version.older "1.7.2" =
|
||||
Param "-m" : Param "autocommit" : ps
|
||||
| Git.Version.older "1.7.8" =
|
||||
Param "--allow-empty-message" :
|
||||
Param "-m" : Param "" : ps
|
||||
| otherwise =
|
||||
Param "--allow-empty-message" :
|
||||
Param "--no-edit" : Param "-m" : Param "" : ps
|
||||
|
||||
{- OSX needs a short delay after a file is added before locking it down,
|
||||
- when using a non-direct mode repository, as pasting a file seems to
|
||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -1,3 +1,10 @@
|
|||
git-annex (4.20130418) UNRELEASED; urgency=low
|
||||
|
||||
* assistant: Work around misfeature in git 1.8.2 that makes
|
||||
`git commit --alow-empty -m ""` run an editor.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Thu, 18 Apr 2013 16:22:48 -0400
|
||||
|
||||
git-annex (4.20130417) unstable; urgency=low
|
||||
|
||||
* initremote: Generates encryption keys with high quality entropy.
|
||||
|
|
Loading…
Reference in a new issue