git-am: make the output quieter.

We used to say "Applying <patch subject>", "Wrote <tree
object>", and "Committed <commit object>".  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 <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index 32c46d7ed4b26220f4c9e7fc778bb240c85dae1c..77a0e20996a3f1a945485135791fd24596f8af60 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -394,9 +394,7 @@ do
                stop_here $this
        fi
 
                stop_here $this
        fi
 

-       echo

        printf 'Applying %s\n' "$SUBJECT"
        printf 'Applying %s\n' "$SUBJECT"

-       echo

 
        case "$resolved" in
        '')
 
        case "$resolved" in
        '')


@@ -452,12 +450,10 @@ do
        fi
 
        tree=$(git write-tree) &&
        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") &&
        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 ||
        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
 
        if test -x "$GIT_DIR"/hooks/post-applypatch
        then