diff options
| author |  Markus Heidelberg <markus.heidelberg@web.de> | 2009-10-25 01:39:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-10-24 17:21:24 -0700 |
| commit | 3319df6f3aa3271124847e2c91c7e6d0be961bc6 (patch) | |
| tree | 925c649097ba2d0c6b68b4b920a857b6d3251ebb /t | |
| parent | Work around option parsing bug in the busybox tar implementation (diff) | |
| download | tgif-3319df6f3aa3271124847e2c91c7e6d0be961bc6.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index ebdccf9a1e..fff6a6d0ea 100755 --- 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 |