From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:51 +0000 (-0700)
Subject: Merge branch 'ng/mergetool-lose-final-prompt'
X-Git-Tag: v2.19.0-rc0~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/03e904cbd600afee7a39160aabc79a628916eecc?hp=3bc484af74132332f5bb69401f223e2fe11bfa39

Merge branch 'ng/mergetool-lose-final-prompt'

"git mergetool" stopped and gave an extra prompt to continue after
the last path has been handled, which did not make much sense.

* ng/mergetool-lose-final-prompt:
mergetool: don't suggest to continue after last file
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index c062e3de3a..d07c7f387c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -491,14 +491,16 @@ main () {
 	printf "%s\n" "$files"
 
 	rc=0
-	for i in $files
+	set -- $files
+	while test $# -ne 0
 	do
 		printf "\n"
-		if ! merge_file "$i"
+		if ! merge_file "$1"
 		then
 			rc=1
-			prompt_after_failed_merge || exit 1
+			test $# -ne 1 && prompt_after_failed_merge || exit 1
 		fi
+		shift
 	done
 
 	exit $rc