Skip to content

Commit

Permalink
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
Browse files Browse the repository at this point in the history
GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt.

Signed-off-by: Markus Heidelberg <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
marcows authored and gitster committed Oct 25, 2009
1 parent 36e5610 commit 3319df6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t7800-difftool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3319df6

Please sign in to comment.