undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: don't suggest to continue after last file

Browse Source 
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>
This commit is contained in:
Nicholas Guriev 2018-08-13 08:09:29 +03:00 committed by Junio C Hamano
parent 53f9a3e157
commit d651a54b8a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-mergetool.sh
View File

@ -491,14 +491,16 @@ main () {
printf "%s\n" "$files" printf "%s\n" "$files"
rc=0 rc=0
for i in $files set -- $files
while test $# -ne 0
do do
printf "\n" printf "\n"
if ! merge_file "$i" if ! merge_file "$1"
then then
rc=1 rc=1
prompt_after_failed_merge || exit 1 test $# -ne 1 && prompt_after_failed_merge || exit 1
fi fi
shift
done done
exit $rc exit $rc