From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 18 Oct 2007 07:45:05 +0000 (-0400)
Subject: Merge branch 'jc/am-quiet'
X-Git-Tag: v1.5.4-rc0~342
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/de61e42b539ffbd28d2a2ba827bb0eb79767057b?ds=inline;hp=-c

Merge branch 'jc/am-quiet'

* jc/am-quiet:
git-am: fix typo in the previous one.
git-am: make the output quieter.
---

de61e42b539ffbd28d2a2ba827bb0eb79767057b
diff --combined git-am.sh
index b02ae6a76f,cfa6fcf0af..2514d07de2
--- a/git-am.sh
+++ b/git-am.sh
@@@ -394,9 -394,7 +394,7 @@@ d
  		stop_here $this
  	fi
  
- 	echo
  	printf 'Applying %s\n' "$SUBJECT"
- 	echo
  
  	case "$resolved" in
  	'')
@@@ -452,10 -450,8 +450,8 @@@
  	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
  
@@@ -464,8 -460,6 +460,8 @@@
  		"$GIT_DIR"/hooks/post-applypatch
  	fi
  
 +	git gc --auto
 +
  	go_next
  done