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

sync: Show output of git commit.

Browse source 
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.
This commit is contained in:
Joey Hess 2016-04-05 16:22:21 -04:00
parent b9c16568ef
commit eb9ac8d6d7
Failed to extract signature
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Sync.hs
View file

@ -214,7 +214,8 @@ commit o = stopUnless shouldcommit $ next $ next $ do
void preCommitDirect void preCommitDirect
commitStaged Git.Branch.ManualCommit commitmessage commitStaged Git.Branch.ManualCommit commitmessage
, do , do
inRepo $ Git.Branch.commitQuiet Git.Branch.ManualCommit showOutput
void $ inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit
[ Param "-a" [ Param "-a"
, Param "-m" , Param "-m"
, Param commitmessage , Param commitmessage

4
Git/Branch.hs
View file

@ -131,10 +131,6 @@ applyCommitMode commitmode ps
commitCommand :: CommitMode -> [CommandParam] -> Repo -> IO Bool commitCommand :: CommitMode -> [CommandParam] -> Repo -> IO Bool
commitCommand = commitCommand' runBool 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' :: ([CommandParam] -> Repo -> IO a) -> CommitMode -> [CommandParam] -> Repo -> IO a
commitCommand' runner commitmode ps = runner $ commitCommand' runner commitmode ps = runner $
Param "commit" : applyCommitMode commitmode ps Param "commit" : applyCommitMode commitmode ps

1
debian/changelog vendored
View file

@ -13,6 +13,7 @@ git-annex (6.20160319) UNRELEASED; urgency=medium
* log: Display time with time zone. * log: Display time with time zone.
* log --raw-date: Use to display seconds from unix epoch. * log --raw-date: Use to display seconds from unix epoch.
* v6: Close pointer file handles more quickly, to avoid problems on Windows. * 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 -- Joey Hess <id@joeyh.name> Wed, 23 Mar 2016 11:42:36 -0400