From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jul 2009 16:38:33 +0000 (-0700)
Subject: Merge branch 'gb/am-foreign'
X-Git-Tag: v1.6.4-rc0~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7557b3431065bfdaaaa8fa3cab5a67a82fae7348;p=git.git

Merge branch 'gb/am-foreign'

* gb/am-foreign:
  git-am: refactor 'cleaning up and aborting'
  git-am foreign patch support: StGIT support
  git-am foreign patch support: autodetect some patch formats
  git-am foreign patch support: introduce patch_format
---

7557b3431065bfdaaaa8fa3cab5a67a82fae7348
diff --cc git-am.sh
index 58d4eb6d2,327807ddc..d64d99753
--- a/git-am.sh
+++ b/git-am.sh
@@@ -281,12 -397,12 +404,12 @@@ els
  		done
  		shift
  	fi
- 	git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" ||  {
- 		rm -fr "$dotest"
- 		exit 1
- 	}
+ 
+ 	check_patch_format "$@"
+ 
+ 	split_patches "$@"
  
 -	# -s, -u, -k, --whitespace, -3, -C and -p flags are kept
 +	# -s, -u, -k, --whitespace, -3, -C, -q and -p flags are kept
  	# for the resuming session after a patch failure.
  	# -i can and must be given when resuming.
  	echo " $git_apply_opt" >"$dotest/apply-opt"