From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 2 Jun 2010 08:33:36 +0000 (+0200)
Subject: git am: Display some help text when patch is empty
X-Git-Tag: v1.7.2-rc0~47^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b;p=git.git

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

diff --git a/git-am.sh b/git-am.sh
index 83a0df035..b6068df6b 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"