diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:51 -0700 |
| commit | 03e904cbd600afee7a39160aabc79a628916eecc (patch) | |
| tree | 734726ee404a43bebb97e6a036b5ed8a60d7fe5f | |
| parent | Merge branch 'jt/commit-graph-per-object-store' (diff) | |
| parent | mergetool: don't suggest to continue after last file (diff) | |
| download | git-03e904cbd600afee7a39160aabc79a628916eecc.tar.gz git-03e904cbd600afee7a39160aabc79a628916eecc.zip | |
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
| -rwxr-xr-x | git-mergetool.sh | 8 |
1 files changed, 5 insertions, 3 deletions
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 |