diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | t/Makefile | 3 | ||||
| -rwxr-xr-x | t/t0000-basic.sh | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -253,7 +253,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ gitk -export TAR INSTALL DESTDIR +export TAR INSTALL DESTDIR SHELL_PATH ### Build rules all: $(PROGRAMS) $(SCRIPTS) diff --git a/t/Makefile b/t/Makefile index 6882e23be..a6b80882c 100644 --- a/t/Makefile +++ b/t/Makefile @@ -4,11 +4,12 @@ # #GIT_TEST_OPTS=--verbose --debug +SHELL_PATH ?= $(SHELL) T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) all: - @$(foreach t,$T,echo "*** $t ***"; sh $t $(GIT_TEST_OPTS) || exit; ) + @$(foreach t,$T,echo "*** $t ***"; $(SHELL_PATH) $t $(GIT_TEST_OPTS) || exit; ) @rm -fr trash clean: diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 3649f0f74..bd940bd09 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -85,7 +85,7 @@ do done test_expect_success \ 'adding various types of objects with git-update-index --add.' \ - 'find path* ! -type d -print0 | xargs -0 git-update-index --add' + 'find path* ! -type d -print | xargs git-update-index --add' # Show them and see that matches what we expect. test_expect_success \ |