From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 2 Jun 2010 08:33:37 +0000 (+0200)
Subject: git am: Remove stray error message from sed
X-Git-Tag: v1.7.2-rc0~47^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92f65e6ab6185aae241d1388b54429d171a9d0f5?ds=sidebyside;hp=dc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b

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>
---

diff --git a/git-am.sh b/git-am.sh
index b6068df6bf..d3f6a89352 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