mergetool: simplify conditionals
Combine the $last_status checks into a single conditional. Replace $last_status and $rollup_status with a single variable. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Nov 20, 2014 at 17:20 UTC
98a260220c9b464dbefce1a23e4c89ed7b6ccb4d
1 file changed
+5
-11
git-mergetool.sh
+5
-11
@@ -426,8 +426,6 @@ fi
426
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
427
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
428
429
-last_status=0
430
-rollup_status=0
429
files=
430
431
if test $# -eq 0
@@ -455,19 +453,15 @@ printf "%s\n" "$files"
453
454
IFS='
455
'
456
+rc=0
457
for i in $files
458
do
460
- if test $last_status -ne 0
461
- then
462
- prompt_after_failed_merge || exit 1
463
- fi
459
printf "\n"
465
- merge_file "$i"
466
- last_status=$?
467
- if test $last_status -ne 0
460
+ if ! merge_file "$i"
461
then
469
- rollup_status=1
462
+ rc=1
463
+ prompt_after_failed_merge || exit 1
464
fi
465
done
466
473
-exit $rollup_status
467
+exit $rc