summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2010-06-02 08:33:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-02 16:53:45 (GMT)
commit92f65e6ab6185aae241d1388b54429d171a9d0f5 (patch)
treea0962096e5eeae540c33709ceff784de8ce79402 /git-am.sh
parentdc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b (diff)
downloadgit-92f65e6ab6185aae241d1388b54429d171a9d0f5.zip
git-92f65e6ab6185aae241d1388b54429d171a9d0f5.tar.gz
git-92f65e6ab6185aae241d1388b54429d171a9d0f5.tar.bz2
git am: Remove stray error message from sed
When --continue is invoked without any changes, the following stray error message appears- sed: can't read $dotest/final-commit: No such file or directory. Remove this by making sure that the file actually exists. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index b6068df..d3f6a89 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -693,7 +693,13 @@ do
else
action=yes
fi
- FIRSTLINE=$(sed 1q "$dotest/final-commit")
+
+ if test -f "$dotest/final-commit"
+ then
+ FIRSTLINE=$(sed 1q "$dotest/final-commit")
+ else
+ FIRSTLINE=""
+ fi
if test $action = skip
then