From: Nicholas Guriev <guriev-ns@ya.ru>
Date: Mon, 13 Aug 2018 05:09:29 +0000 (+0300)
Subject: mergetool: don't suggest to continue after last file
X-Git-Tag: v2.19.0-rc0~22^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d651a54b8a22a307f5b061ba50c5348ae31e861c;p=thirdparty%2Fgit.git

mergetool: don't suggest to continue after last file

Eliminate an unnecessary prompt to continue after failed merger, by
not calling the prompt_after_failed_merge function when only one
iteration remains.

Uses positional parameters to count files in the list to make it
easier to see if we have any more paths to process from within the
loop.

Signed-off-by: Nicholas Guriev <guriev-ns@ya.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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