From dc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Wed, 2 Jun 2010 10:33:36 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-am.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-am.sh b/git-am.sh index 83a0df0352..b6068df6bf 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"