undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests 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
commit 40ffc49876
1 changed files with 2 additions and 1 deletions
Show Stats 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= msgnum=
;; ;;
*) *)
if test -n "$parse_patch" ; then if test -n "$patch_format"
then
clean_abort "Patch format $patch_format is not supported." clean_abort "Patch format $patch_format is not supported."
else else
clean_abort "Patch format detection failed." clean_abort "Patch format detection failed."