summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-22 21:42:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-22 21:42:38 (GMT)
commitf50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f (patch)
tree99cb0e9d99591f00b68eeb540d567aec88565475
parentba9a247bf62a56c354bca640ba0ee131a3347864 (diff)
parent6b445773b78544032262b897c9aa3b5bd4405dd3 (diff)
downloadgit-f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f.zip
git-f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f.tar.gz
git-f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f.tar.bz2
Merge branch 'jc/maint-mergetool-read-fix'
* jc/maint-mergetool-read-fix: mergetool: check return value from read
-rwxr-xr-xgit-mergetool.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 3aab5aa..3c157bc 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -100,7 +100,7 @@ resolve_deleted_merge () {
else
printf "Use (c)reated or (d)eleted file, or (a)bort? "
fi
- read ans
+ read ans || return 1
case "$ans" in
[mMcC]*)
git add -- "$MERGED"
@@ -122,7 +122,7 @@ resolve_deleted_merge () {
resolve_submodule_merge () {
while true; do
printf "Use (l)ocal or (r)emote, or (a)bort? "
- read ans
+ read ans || return 1
case "$ans" in
[lL]*)
if ! local_present; then
@@ -249,7 +249,7 @@ merge_file () {
describe_file "$remote_mode" "remote" "$REMOTE"
if "$prompt" = true; then
printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
- read ans
+ read ans || return 1
fi
if base_present; then
@@ -320,7 +320,7 @@ done
prompt_after_failed_merge() {
while true; do
printf "Continue merging other unresolved paths (y/n) ? "
- read ans
+ read ans || return 1
case "$ans" in
[yY]*)