summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Shearman <rob@codeweavers.com>2006-05-02 12:32:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-02 19:42:12 (GMT)
commitced9456a27197fc038fbc5b5ebad87e55f1920d2 (patch)
treee741e863f258542c9be9269d636907f7a7f3e597
parent262a6ef76a1dde97ab50d79fa5cd6d3f9f125765 (diff)
downloadgit-ced9456a27197fc038fbc5b5ebad87e55f1920d2.zip
git-ced9456a27197fc038fbc5b5ebad87e55f1920d2.tar.gz
git-ced9456a27197fc038fbc5b5ebad87e55f1920d2.tar.bz2
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
Give the user a hint for how to continue in the case that git-am fails because it requires user intervention. Signed-off-by: Robert Shearman <rob@codeweaves.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-am.sh26
1 files changed, 23 insertions, 3 deletions
diff --git a/git-am.sh b/git-am.sh
index 872145b..507ae4d 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -14,6 +14,26 @@ stop_here () {
exit 1
}
+stop_here_user_resolve () {
+ cmdline=$(basename $0)
+ if test '' != "$interactive"
+ then
+ cmdline="$cmdline -i"
+ fi
+ if test '' != "$threeway"
+ then
+ cmdline="$cmdline -3"
+ fi
+ if test '.dotest' != "$dotest"
+ then
+ cmdline="$cmdline -d=$dotest"
+ fi
+ echo "When you have resolved this problem run \"$cmdline --resolved\"."
+ echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
+
+ stop_here $1
+}
+
go_next () {
rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
"$dotest/patch" "$dotest/info"
@@ -374,14 +394,14 @@ do
if test '' = "$changed"
then
echo "No changes - did you forget update-index?"
- stop_here $this
+ stop_here_user_resolve $this
fi
unmerged=$(git-ls-files -u)
if test -n "$unmerged"
then
echo "You still have unmerged paths in your index"
echo "did you forget update-index?"
- stop_here $this
+ stop_here_user_resolve $this
fi
apply_status=0
;;
@@ -407,7 +427,7 @@ do
if test $apply_status != 0
then
echo Patch failed at $msgnum.
- stop_here $this
+ stop_here_user_resolve $this
fi
if test -x "$GIT_DIR"/hooks/pre-applypatch