diff options
| author | Jay Soffian <jaysoffian@gmail.com> | 2011-09-19 23:40:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-20 00:41:49 (GMT) |
| commit | e622f41dcd97861796c7529712170f9eae07dc56 (patch) | |
| tree | 03aa1a788b47d2b24e0ef06ee8d9375328ec23e7 /git-mergetool.sh | |
| parent | 740a8fc2249cf7d8b39ab50a25bbf86554158ae7 (diff) | |
| download | git-e622f41dcd97861796c7529712170f9eae07dc56.zip git-e622f41dcd97861796c7529712170f9eae07dc56.tar.gz git-e622f41dcd97861796c7529712170f9eae07dc56.tar.bz2 | |
git-mergetool: check return value from read
Mostly fixed already by 6b44577 (mergetool: check return value
from read, 2011-07-01). Catch two uses it missed.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 3c157bc..b6d463f 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -72,7 +72,7 @@ describe_file () { resolve_symlink_merge () { while true; do printf "Use (l)ocal or (r)emote, or (a)bort? " - read ans + read ans || return 1 case "$ans" in [lL]*) git checkout-index -f --stage=2 -- "$MERGED" |