Browse Source

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>
maint
Ramkumar Ramachandra 15 years ago committed by Junio C Hamano
parent
commit
dc267b1ab4
  1. 2
      git-am.sh

2
git-am.sh

@ -592,6 +592,8 @@ do @@ -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"

Loading…
Cancel
Save