From 1f088191015968436e7cc6423827b0c26f3427ea Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 29 Sep 2007 20:45:33 -0700 Subject: [PATCH 1/2] git-am: make the output quieter. We used to say "Applying ", "Wrote ", and "Committed ". Worse yet, with extra blank lines around them. Make the output more concise. The object names are not so useful nor interesting. Signed-off-by: Junio C Hamano --- git-am.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/git-am.sh b/git-am.sh index 32c46d7ed4..77a0e20996 100755 --- a/git-am.sh +++ b/git-am.sh @@ -394,9 +394,7 @@ do stop_here $this fi - echo printf 'Applying %s\n' "$SUBJECT" - echo case "$resolved" in '') @@ -452,12 +450,10 @@ do fi tree=$(git write-tree) && - echo Wrote tree $tree && parent=$(git rev-parse --verify HEAD) && commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") && - echo Committed: $commit && git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent || - stop_here $this + stop_here $thisy if test -x "$GIT_DIR"/hooks/post-applypatch then From 076d7aa5d406fea1a5dedff5e2c54e2716528222 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 1 Oct 2007 00:27:51 -0700 Subject: [PATCH 2/2] git-am: fix typo in the previous one. Caught on #git by Ulrik Sverdrup Signed-off-by: Junio C Hamano --- git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-am.sh b/git-am.sh index 77a0e20996..cfa6fcf0af 100755 --- a/git-am.sh +++ b/git-am.sh @@ -453,7 +453,7 @@ do parent=$(git rev-parse --verify HEAD) && commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") && git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent || - stop_here $thisy + stop_here $this if test -x "$GIT_DIR"/hooks/post-applypatch then