kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2005-11-10 19:30:23 -08:00
parent e433705dd4
commit fd66dbf529
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-merge-one-file.sh
View File

@ -64,7 +64,13 @@ case "${1:-.}${2:-.}${3:-.}" in
# This extracts OUR file in $orig, and uses git-apply to # This extracts OUR file in $orig, and uses git-apply to
# remove lines that are unique to ours. # remove lines that are unique to ours.
orig=`git-unpack-file $2` 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
# worth trying two-file merge using common subsections.
expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
;; ;;
*) *)
echo "Auto-merging $4." echo "Auto-merging $4."