From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 04 Jun 2010 21:18:11 GMT
Subject: Re: What's cooking in git.git (Jun 2010, #01; Wed, 2)
Message-ID: <20100604211811.GA7471@progeny.tock>
In-Reply-To: <7v4ohlatwn.fsf@alter.siamese.dyndns.org>

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.

Maybe it could be made portable with ‘git diff --no-index’?

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 3145009..d067894 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
--