From: Markus Heidelberg Date: Sat, 24 Oct 2009 23:39:19 GMT Subject: [PATCH] t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test Message-ID: <1256427559-28698-1-git-send-email-markus.heidelberg@web.de> GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt. Signed-off-by: Markus Heidelberg --- 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 ebdccf9..fff6a6d 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 -- 1.6.5.1.86.g7f7ff