From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Sat, 24 Oct 2009 23:39:19 +0000 (+0200)
Subject: t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
X-Git-Tag: v1.6.5.2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3319df6f3aa3271124847e2c91c7e6d0be961bc6;p=git.git

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>
---

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index ebdccf9a1..fff6a6d0e 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