global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-12 01:40:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gb/maint-am-patch-format-error-message' into maint

Browse Source 
* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch
This commit is contained in:
Junio C Hamano
2011-09-23 14:11:18 -07:00
parent e622f41dcd dff4b0ef30
commit 40ffc49876
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-am.sh
View File

@@ -305,7 +305,8 @@ split_patches () {
msgnum=
;;
*)
if test -n "$parse_patch" ; then
if test -n "$patch_format"
then
clean_abort "Patch format $patch_format is not supported."
else
clean_abort "Patch format detection failed."