Commit 3319df6f authored by Markus Heidelberg's avatar Markus Heidelberg Committed by Junio C Hamano

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's avatarMarkus Heidelberg <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 36e56106
......@@ -136,7 +136,7 @@ test_expect_success 'GIT_DIFFTOOL_PROMPT variable' '
GIT_DIFFTOOL_PROMPT=true &&
export GIT_DIFFTOOL_PROMPT &&
prompt=$(echo | git difftool --prompt branch | tail -1) &&
prompt=$(echo | git difftool branch | tail -1) &&
prompt_given "$prompt" &&
restore_test_defaults
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment