Re: What's cooking in git.git (Jun 2010, #01; Wed, 2)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 5, 2010, 18:07 UTC
- Message-ID
- <7v39x1z72z.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20100604211811.GA7471@progeny.tock>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 8 quoted lines
> Junio C Hamano wrote: > >> * gv/portable (2010-05-14) 18 commits > [...] >> - Do not use "diff" found on PATH while building and installing > > That patch (d1b1a919) breaks merge-one-file when run outside the test > suite as far as I can tell.
Thanks for catching. I wonder if something like this would be better in that it wouldn't break people who do not use custom "DIFF" while it would help people who do at the same time...
Makefile | 2 ++ git-merge-one-file.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile index bcb84be..0367e8a 100644 --- a/Makefile +++ b/Makefile @@ -1494,6 +1494,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) +DIFF_SQ = $(subst ','\'',$(DIFF)) LIBS = $(GITLIBS) $(EXTLIBS) @@ -1582,6 +1583,7 @@ define cmd_munge_script $(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \ + -e 's|@@DIFF@@|$(DIFF_SQ)|' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ -e $(BROKEN_PATH_FIX) \ diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 3145009..b86402a 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in # remove lines that are unique to ours. orig=`git-unpack-file $2` sz0=`wc -c <"$orig"` - $DIFF -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add + @@DIFF@@ -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add sz1=`wc -c <"$orig"` # If we do not have enough common material, it is not