Skip to content

Commit

Permalink
git am: Remove stray error message from sed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ramkumar Ramachandra authored and Junio C Hamano committed Jun 2, 2010
1 parent dc267b1 commit 92f65e6
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 92f65e6

Please sign in to comment.