summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-26 17:13:07 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-26 17:39:04 -0800
commit80809062452a65146d73ae483415acbc737fabf1 (patch)
treed5b65e07896705f4dda05424a324fd455519d865 /git-am.sh
parentba998d33e22d6fce4445af5834dc227609672501 (diff)
parent62ed0728fe52312f270760187b3280bc51b6c2f0 (diff)
downloadgit-80809062452a65146d73ae483415acbc737fabf1.tar.gz
Merge branch 'maint'
* maint: Document accumulated fixes since 1.7.9.2 Git 1.7.8.5 grep -P: Fix matching ^ and $ am: don't infloop for an empty input file rebase -m: only call "notes copy" when rewritten exists and is non-empty git-p4: remove bash-ism in t9800 git-p4: remove bash-ism in t9809 git-p4: fix submit regression with clientSpec and subdir clone git-p4: set useClientSpec variable on initial clone Makefile: add thread-utils.h to LIB_H Conflicts: RelNotes t/t9809-git-p4-client-view.sh
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 64d8e2a64d..906f91f188 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -202,7 +202,7 @@ check_patch_format () {
l1=
while test -z "$l1"
do
- read l1
+ read l1 || break
done
read l2
read l3