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

mergetool: check return value from read

Browse Source 
The process may not even have the standard input open in which case it
will get stuck in an infinite loop to prompt and read nothing.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-07-01 16:11:16 -07:00
parent 76c82f90ab
commit 6b445773b7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-mergetool.sh
View File

@ -100,7 +100,7 @@ resolve_deleted_merge () {
else else
printf "Use (c)reated or (d)eleted file, or (a)bort? " printf "Use (c)reated or (d)eleted file, or (a)bort? "
fi fi
read ans read ans || return 1
case "$ans" in case "$ans" in
[mMcC]*) [mMcC]*)
git add -- "$MERGED" git add -- "$MERGED"
@ -122,7 +122,7 @@ resolve_deleted_merge () {
resolve_submodule_merge () { resolve_submodule_merge () {
while true; do while true; do
printf "Use (l)ocal or (r)emote, or (a)bort? " printf "Use (l)ocal or (r)emote, or (a)bort? "
read ans read ans || return 1
case "$ans" in case "$ans" in
[lL]*) [lL]*)
if ! local_present; then if ! local_present; then
@ -249,7 +249,7 @@ merge_file () {
describe_file "$remote_mode" "remote" "$REMOTE" describe_file "$remote_mode" "remote" "$REMOTE"
if "$prompt" = true; then if "$prompt" = true; then
printf "Hit return to start merge resolution tool (%s): " "$merge_tool" printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
read ans read ans || return 1
fi fi
if base_present; then if base_present; then
@ -320,7 +320,7 @@ done
prompt_after_failed_merge() { prompt_after_failed_merge() {
while true; do while true; do
printf "Continue merging other unresolved paths (y/n) ? " printf "Continue merging other unresolved paths (y/n) ? "
read ans read ans || return 1
case "$ans" in case "$ans" in
[yY]*) [yY]*)