From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Dec 2005 21:04:43 +0000 (-0800)
Subject: Merge branch 'hold/am'
X-Git-Tag: v0.99.9n^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a26dbd120110ad4e07d3047abc13d615183c8ec?hp=-c

Merge branch 'hold/am'
---

9a26dbd120110ad4e07d3047abc13d615183c8ec
diff --combined git-am.sh
index 39f255209e,f143b7e782..343bee9d81
--- a/git-am.sh
+++ b/git-am.sh
@@@ -1,10 -1,14 +1,10 @@@
  #!/bin/sh
  #
  #
 -. git-sh-setup
  
 -usage () {
 -    echo >&2 "usage: $0 [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>"
 -    echo >&2 "	or, when resuming"
 -    echo >&2 "	$0 [--skip | --resolved]"
 -    exit 1;
 -}
 +USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
 +  or, when resuming [--skip | --resolved]'
 +. git-sh-setup
  
  stop_here () {
      echo "$1" >"$dotest/next"
@@@ -160,10 -164,7 +160,7 @@@ els
  	# Start afresh.
  	mkdir -p "$dotest" || exit
  
- 	# cat does the right thing for us, including '-' to mean
- 	# standard input.
- 	cat "$@" |
- 	git-mailsplit -d$prec "$dotest/" >"$dotest/last" || {
+ 	git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" ||  {
  		rm -fr "$dotest"
  		exit 1
  	}