From fd66dbf5297a4badec8c2accf8a0f9bd72e3f693 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 10 Nov 2005 19:30:23 -0800 Subject: [PATCH] merge-one-file: use empty- or common-base condintionally in two-stage merge. If two sides added the same path completely different thing, it is easier to see the merge pivoting on /dev/null. So check the size of the common section we have found, and empty it if it is too small. Signed-off-by: Junio C Hamano --- git-merge-one-file.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index d9ee458150..b08597de29 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -64,7 +64,13 @@ case "${1:-.}${2:-.}${3:-.}" in # This extracts OUR file in $orig, and uses git-apply to # 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 + sz1=`wc -c <"$orig"` + + # If we do not have enough common material, it is not + # worth trying two-file merge using common subsections. + expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig ;; *) echo "Auto-merging $4."