commit 3319df6f3aa3271124847e2c91c7e6d0be961bc6
author Markus Heidelberg <markus.heidelberg@web.de> Sun Oct 25 01:39:19 2009 +0200
committer Junio C Hamano <gitster@pobox.com> Sat Oct 24 17:21:24 2009 -0700
tree 925c649097ba2d0c6b68b4b920a857b6d3251ebb
parent 36e561064e83d3f890f8fa128b3ca4e0d7691f10

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>

t/t7800-difftool.sh

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