Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
author
Markus Heidelberg
<markus.heidelberg@web.de>
Sat, 24 Oct 2009 23:39:19 +0000
(
01:39
+0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 25 Oct 2009 00:21:24 +0000
(17:21 -0700)
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>
t/t7800-difftool.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
36e5610
)
diff --git
a/t/t7800-difftool.sh
b/t/t7800-difftool.sh
index ebdccf9a1eb9f9bb4918fc5adee8bdb8fd682608..fff6a6d0eab4b27d5bc7ff4636913cb10296ab7b 100755
(executable)
--- a/
t/t7800-difftool.sh
+++ b/
t/t7800-difftool.sh
@@
-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