diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-25 00:21:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-25 00:21:26 -0700 |
| commit | 18fbc94c3c00964beddeb4c415167557c16519d0 (patch) | |
| tree | e321aa5d5611bba9fc5f321a505e037c66e8dbd2 /t | |
| parent | 02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac (diff) | |
| parent | 3319df6f3aa3271124847e2c91c7e6d0be961bc6 (diff) | |
| download | git-18fbc94c3c00964beddeb4c415167557c16519d0.tar.gz git-18fbc94c3c00964beddeb4c415167557c16519d0.tar.xz | |
Merge branch 'maint'
* maint:
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
Work around option parsing bug in the busybox tar implementation
Diffstat (limited to 't')
| -rwxr-xr-x | 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 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 |