diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-25 10:21:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-25 10:21:26 +0300 |
| commit | 18fbc94c3c00964beddeb4c415167557c16519d0 (patch) | |
| tree | e321aa5d5611bba9fc5f321a505e037c66e8dbd2 | |
| parent | 02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac (diff) | |
| parent | 3319df6f3aa3271124847e2c91c7e6d0be961bc6 (diff) | |
Merge branch 'maint'
* maint:
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
Work around option parsing bug in the busybox tar implementation
| -rwxr-xr-x | t/t7800-difftool.sh | 2 | ||||
| -rw-r--r-- | templates/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index ebdccf9a1e..fff6a6d0ea 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 diff --git a/templates/Makefile b/templates/Makefile index a12c6e214e..408f0137a8 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -50,4 +50,4 @@ clean: install: all $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)' (cd blt && $(TAR) cf - .) | \ - (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xfo -) + (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xof -) |