{"thread":{"id":"21347","subject":"[PATCH] t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test","startedAt":"2009-10-24T23:39:19Z","lastAt":"2009-10-24T23:39:19Z","messageCount":1,"participants":["Markus Heidelberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"125865","messageId":"1256427559-28698-1-git-send-email-markus.heidelberg@web.de","threadId":"21347","inReplyTo":null,"subject":"[PATCH] t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-10-24T23:39:19Z","receivedAt":"2009-10-24T23:39:19Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt.\n\nSigned-off-by: Markus Heidelberg <markus.heidelberg@web.de>\n---\n t/t7800-difftool.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh\nindex ebdccf9..fff6a6d 100755\n--- a/t/t7800-difftool.sh\n+++ b/t/t7800-difftool.sh\n@@ -136,7 +136,7 @@ test_expect_success 'GIT_DIFFTOOL_PROMPT variable' '\n \tGIT_DIFFTOOL_PROMPT=true &&\n \texport GIT_DIFFTOOL_PROMPT &&\n \n-\tprompt=$(echo | git difftool --prompt branch | tail -1) &&\n+\tprompt=$(echo | git difftool branch | tail -1) &&\n \tprompt_given \"$prompt\" &&\n \n \trestore_test_defaults\n-- \n1.6.5.1.86.g7f7ff\n"}]}