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>
Ramkumar Ramachandra committed
Jun 2, 2010 at 10:33 UTC
dc267b1ab4f8f6ac33c9145c3e24fe3a96f1394b
1 file changed
+2
git-am.sh
+2
@@ -592,6 +592,8 @@ do
592
593
test -s "$dotest/patch" || {
594
echo "Patch is empty. Was it split wrong?"
595
+ echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
596
+ echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
597
stop_here $this
598
}
599
rm -f "$dotest/original-commit"