summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2010-06-02 08:33:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-02 16:51:48 (GMT)
commitdc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b (patch)
tree023ab11d212178912da1cd04ebcc9c17ccf03f2d /git-am.sh
parentd2c46310618ab0fefe4641b5a0d71899c918bf47 (diff)
downloadgit-dc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b.zip
git-dc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b.tar.gz
git-dc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b.tar.bz2
git am: Display some help text when patch is empty
When a patch is found to be empty, prompt the user to use either --skip or --abort. 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.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 83a0df0..b6068df 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -592,6 +592,8 @@ do
test -s "$dotest/patch" || {
echo "Patch is empty. Was it split wrong?"
+ echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
+ echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
stop_here $this
}
rm -f "$dotest/original-commit"