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 <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Markus Heidelberg committed
Oct 25, 2009 at 01:39 UTC
3319df6f3aa3271124847e2c91c7e6d0be961bc6
1 file changed
+1
-1
t/t7800-difftool.sh
+1
-1
@@ -136,7 +136,7 @@ test_expect_success 'GIT_DIFFTOOL_PROMPT variable' '
136
GIT_DIFFTOOL_PROMPT=true &&
137
export GIT_DIFFTOOL_PROMPT &&
138
139
- prompt=$(echo | git difftool --prompt branch | tail -1) &&
139
+ prompt=$(echo | git difftool branch | tail -1) &&
140
prompt_given "$prompt" &&
141
142
restore_test_defaults