diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-05 16:22:21 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-05 16:22:21 -0400 |
| commit | f33f3e5fa2ef208c6fdeb1f26c3dd3f5a0092b1a (patch) | |
| tree | b6c48a11660e1ca6587690e819e5cc570518a0e9 | |
| parent | ac5401196d6657b2298b5f0ca1be5122d9821d20 (diff) | |
sync: Show output of git commit.
Rationalle: User might have hook scripts whose output they want to see.
Also, git commit output may tell the user they forgot to add a file.
The output is not too ugly when there's nothing to commit.
| -rw-r--r-- | Command/Sync.hs | 3 | ||||
| -rw-r--r-- | Git/Branch.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 135f8b42d..69f39bb8a 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -214,7 +214,8 @@ commit o = stopUnless shouldcommit $ next $ next $ do void preCommitDirect commitStaged Git.Branch.ManualCommit commitmessage , do - inRepo $ Git.Branch.commitQuiet Git.Branch.ManualCommit + showOutput + void $ inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit [ Param "-a" , Param "-m" , Param commitmessage diff --git a/Git/Branch.hs b/Git/Branch.hs index 76097fe13..8f79f59b6 100644 --- a/Git/Branch.hs +++ b/Git/Branch.hs @@ -131,10 +131,6 @@ applyCommitMode commitmode ps commitCommand :: CommitMode -> [CommandParam] -> Repo -> IO Bool commitCommand = commitCommand' runBool -{- Commit will fail when the tree is clean. This suppresses that error. -} -commitQuiet :: CommitMode -> [CommandParam] -> Repo -> IO () -commitQuiet commitmode ps = void . tryIO . commitCommand' runQuiet commitmode ps - commitCommand' :: ([CommandParam] -> Repo -> IO a) -> CommitMode -> [CommandParam] -> Repo -> IO a commitCommand' runner commitmode ps = runner $ Param "commit" : applyCommitMode commitmode ps diff --git a/debian/changelog b/debian/changelog index 04fe35efa..1134ca2de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ git-annex (6.20160319) UNRELEASED; urgency=medium * log: Display time with time zone. * log --raw-date: Use to display seconds from unix epoch. * v6: Close pointer file handles more quickly, to avoid problems on Windows. + * sync: Show output of git commit. -- Joey Hess <id@joeyh.name> Wed, 23 Mar 2016 11:42:36 -0400 |