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>
Jeff King committed
Mar 12, 2008 at 17:41 UTC
4bf9f27dfb4ed6fd67a9bfc6f80e10b8c6980c85
2 files changed
+2
-1
Makefile
+1
@@ -873,6 +873,7 @@ common-cmds.h: $(wildcard Documentation/git-*.txt)
873
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
874
$(QUIET_GEN)$(RM) $@ $@+ && \
875
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
876
+ -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
877
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
878
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
879
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
git-filter-branch.sh
+1
-1
@@ -309,7 +309,7 @@ while read commit parents; do
309
sed -e '1,/^$/d' <../commit | \
310
eval "$filter_msg" > ../message ||
311
die "msg filter failed: $filter_msg"
312
- sh -c "$filter_commit" "git commit-tree" \
312
+ @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
313
$(git write-tree) $parentstr < ../message > ../map/$commit
314
done <../revs
315