[PATCH] Give the user a hint for how to continue in the case that git-am fails because it requires user intervention

[Robert Shearman <rob@codeweavers.com>]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

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>

---

When git-am fails because it needs user intervention, the user may not 
know what they need to do to continue with applying the mailbox. This 
patch gives them a hint to use git-am (as they may have started the 
operation from another tool, such as git-rebase). As the threeway, 
interactive and dotest options are not persisted, the user may also 
forget to include them (or not realise at all that they should be 
included), so we should also tell the user to include these options if 
they were orignally specified.

  git-am.sh |   26 +++++++++++++++++++++++---
  1 files changed, 23 insertions(+), 3 deletions(-)


[-- Attachment #2: ead48bae7157a30589791165b7b71208b68cf229.diff --]
[-- Type: text/x-patch, Size: 1410 bytes --]

ead48bae7157a30589791165b7b71208b68cf229
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