Skip to content

Commit 3319df6

Browse files
marcowsgitster
authored andcommitted
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt. Signed-off-by: Markus Heidelberg <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 36e5610 commit 3319df6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t7800-difftool.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ test_expect_success 'GIT_DIFFTOOL_PROMPT variable' '
136136
GIT_DIFFTOOL_PROMPT=true &&
137137
export GIT_DIFFTOOL_PROMPT &&
138138
139-
prompt=$(echo | git difftool --prompt branch | tail -1) &&
139+
prompt=$(echo | git difftool branch | tail -1) &&
140140
prompt_given "$prompt" &&
141141
142142
restore_test_defaults

0 commit comments

Comments
 (0)