build: propagate $DIFF to scripts
git-merge-one-file expects to run "-u" capable "diff", but using $DIFF is not the right way to do so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 5, 2010 at 09:36 UTC
09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c
2 files changed
+3
-1
Makefile
+2
@@ -1494,6 +1494,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
1494
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
1495
PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
1496
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
1497
+DIFF_SQ = $(subst ','\'',$(DIFF))
1498
1499
LIBS = $(GITLIBS) $(EXTLIBS)
1500
@@ -1582,6 +1583,7 @@ define cmd_munge_script
1583
$(RM) $@ $@+ && \
1584
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
1585
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
1586
+ -e 's|@@DIFF@@|$(DIFF_SQ)|' \
1587
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
1588
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
1589
-e $(BROKEN_PATH_FIX) \
git-merge-one-file.sh
+1
-1
@@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
107
# remove lines that are unique to ours.
108
orig=`git-unpack-file $2`
109
sz0=`wc -c <"$orig"`
110
- $DIFF -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
110
+ @@DIFF@@ -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
111
sz1=`wc -c <"$orig"`
112
113
# If we do not have enough common material, it is not