@matheusbsbs / matheus-bagliano / commits / fd66dbf529
Fork 0

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 <junkio@cox.net>

Junio C Hamano committed Nov 10, 2005 at 19:30 UTC fd66dbf5297a4badec8c2accf8a0f9bd72e3f693
1 file changed +6
git-merge-one-file.sh
+6
@@ -64,7 +64,13 @@ case "${1:-.}${2:-.}${3:-.}" in
64 # This extracts OUR file in $orig, and uses git-apply to
65 # remove lines that are unique to ours.
66 orig=`git-unpack-file $2`
67 + sz0=`wc -c <"$orig"`
68 diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
69 + sz1=`wc -c <"$orig"`
70 +
71 + # If we do not have enough common material, it is not
72 + # worth trying two-file merge using common subsections.
73 + expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
74 ;;
75 *)
76 echo "Auto-merging $4."