diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-18 16:27:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-18 16:27:17 -0400 |
| commit | 7e1e8a26399b5c4a7904adf708d252515181543b (patch) | |
| tree | 5323137f4de6fd336940fb693117996bbc2fc846 /Assistant/Threads/Committer.hs | |
| parent | e9a4ccc115776f5c30857438eb8ece1c5a02d7ec (diff) | |
assistant: Work around misfeature in git 1.8.2 that makes `git commit --alow-empty -m ""` run an editor.
Diffstat (limited to 'Assistant/Threads/Committer.hs')
| -rw-r--r-- | Assistant/Threads/Committer.hs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 727b85840..aaec25206 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -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 |