Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git am: Display some help text when patch is empty
author
Ramkumar Ramachandra
<artagnon@gmail.com>
Wed, 2 Jun 2010 08:33:36 +0000
(10:33 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 2 Jun 2010 16:51:48 +0000
(09:51 -0700)
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>
git-am.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d2c4631
)
diff --git
a/git-am.sh
b/git-am.sh
index 83a0df0352cd9e7104290c5ad1f3db88cf6a5722..b6068df6bf790851bc271d642706f38fe079ebac 100755
(executable)
--- 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"