Skip to content

Commit dff4b0e

Browse files
Oblomovgitster
authored andcommitted
am: format is in $patch_format, not parse_patch
The error message given when the patch format was not recognized was wrong, since the variable checked was $parse_patch rather than $patch_format. Fix by checking the non-emptyness of the correct variable. Signed-off-by: Giuseppe Bilotta <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 46caf50 commit dff4b0e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-am.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ split_patches () {
268268
msgnum=
269269
;;
270270
*)
271-
if test -n "$parse_patch" ; then
271+
if test -n "$patch_format"
272+
then
272273
clean_abort "Patch format $patch_format is not supported."
273274
else
274275
clean_abort "Patch format detection failed."

0 commit comments

Comments
 (0)