diff options
| author |  Jeff King <peff@peff.net> | 2008-03-12 17:41:39 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-13 00:57:53 -0700 |
| commit | 4bf9f27dfb4ed6fd67a9bfc6f80e10b8c6980c85 (patch) | |
| tree | 6c6133cc4bf3598cf27ba98762ff415526b10caa | |
| parent | filter-branch: don't use xargs -0 (diff) | |
| download | tgif-4bf9f27dfb4ed6fd67a9bfc6f80e10b8c6980c85.tar.xz | |
filter-branch: use $SHELL_PATH instead of 'sh'
On some systems, 'sh' isn't very friendly. In particular,
t7003 fails on Solaris because it doesn't understand $().
Instead, use the specified SHELL_PATH to run shell code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | git-filter-branch.sh | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -873,6 +873,7 @@ common-cmds.h: $(wildcard Documentation/git-*.txt) $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \ -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ diff --git a/git-filter-branch.sh b/git-filter-branch.sh index efef732202..22b6ed4a78 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -309,7 +309,7 @@ while read commit parents; do sed -e '1,/^$/d' <../commit | \ eval "$filter_msg" > ../message || die "msg filter failed: $filter_msg" - sh -c "$filter_commit" "git commit-tree" \ + @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ $(git write-tree) $parentstr < ../message > ../map/$commit done <../revs |