test-lib: Adjust output to be valid TAP format

diff --git a/git-am.sh b/git-am.sh
index b6068df6bf790851bc271d642706f38fe079ebac..ef2d51a2b80d77dc5fe28d76b5047a97dc4c0fae 100755 (executable)
--- 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
@@ -729,6 +735,8 @@ do
                resolved=
                git diff-index --quiet --cached HEAD -- && {
                        echo "No changes - did you forget to use 'git add'?"
+                       echo "If there is nothing left to stage, chances are that something else"
+                       echo "already introduced the same changes; you might want to skip this patch."
                        stop_here_user_resolve $this
                }
                unmerged=$(git ls-files -u)