summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-18 18:16:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-18 18:16:56 (GMT)
commit8b8063cef3933c25288f2ab78d2adf1a4a2149ce (patch)
tree48358f8e4080985c8ef4de2ac345b0ab400b3952 /git-am.sh
parent0f0169d153ddb40628075a5e752ac7fe87ddc958 (diff)
parent92f65e6ab6185aae241d1388b54429d171a9d0f5 (diff)
downloadgit-8b8063cef3933c25288f2ab78d2adf1a4a2149ce.zip
git-8b8063cef3933c25288f2ab78d2adf1a4a2149ce.tar.gz
git-8b8063cef3933c25288f2ab78d2adf1a4a2149ce.tar.bz2
Merge branch 'rr/am-help'
* rr/am-help: git am: Remove stray error message from sed git am: Display some help text when patch is empty git am: Set cmdline globally
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh29
1 files changed, 19 insertions, 10 deletions
diff --git a/git-am.sh b/git-am.sh
index 43ea52c..ef2d51a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -52,6 +52,16 @@ else
HAS_HEAD=
fi
+cmdline="git am"
+if test '' != "$interactive"
+then
+ cmdline="$cmdline -i"
+fi
+if test '' != "$threeway"
+then
+ cmdline="$cmdline -3"
+fi
+
sq () {
git rev-parse --sq-quote "$@"
}
@@ -66,15 +76,6 @@ stop_here_user_resolve () {
printf '%s\n' "$resolvemsg"
stop_here $1
fi
- cmdline="git am"
- if test '' != "$interactive"
- then
- cmdline="$cmdline -i"
- fi
- if test '' != "$threeway"
- then
- cmdline="$cmdline -3"
- fi
echo "When you have resolved this problem run \"$cmdline --resolved\"."
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\"."
@@ -591,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"
@@ -690,7 +693,13 @@ do
else
action=yes
fi
- FIRSTLINE=$(sed 1q "$dotest/final-commit")
+
+ if test -f "$dotest/final-commit"
+ then
+ FIRSTLINE=$(sed 1q "$dotest/final-commit")
+ else
+ FIRSTLINE=""
+ fi
if test $action = skip
then