[PATCH v2 2/3] git am: Display some help text when patch is empty
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jun 2, 2010, 08:33 UTC
- Message-ID
- <1275467617-23065-3-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1275467617-23065-1-git-send-email-artagnon@gmail.com>
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> --- git-am.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/git-am.sh b/git-am.sh index b75358b..a52c2b4 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"
-- 1.7.1