From: Jim Meyering Date: Sat, 25 Feb 2012 17:34:26 +0000 (+0100) Subject: am: don't infloop for an empty input file X-Git-Tag: v1.7.8.5~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0c5793b37a53992611968ab4a1d62a0e3edc2dd;p=git.git am: don't infloop for an empty input file git-am.sh's check_patch_format function would attempt to preview the patch to guess its format, but would go into an infinite loop when the patch file happened to be empty. The solution: exit the loop when "read" fails, not when the line var, "$l1" becomes empty. Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano --- diff --git a/git-am.sh b/git-am.sh index 1c13b1399..f43a75b04 100755 --- a/git-am.sh +++ b/git-am.sh @@ -201,7 +201,7 @@ check_patch_format () { l1= while test -z "$l1" do - read l1 + read l1 || break done read l2 read l3 diff --git a/t/t4150-am.sh b/t/t4150-am.sh index d7d9ccc1c..03eee07ff 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -495,4 +495,14 @@ test_expect_success 'am -q is quiet' ' ! test -s output.out ' +test_expect_success 'am empty-file does not infloop' ' + rm -fr .git/rebase-apply && + git reset --hard && + touch empty-file && + test_tick && + { git am empty-file > actual 2>&1 && false || :; } && + echo Patch format detection failed. >expected && + test_cmp expected actual +' + test_done