From 2276aa6c098a0337bc2bec49742e332bdd1b802c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 10 Sep 2005 17:56:19 -0700 Subject: [PATCH] Use Daniel's read-tree in the merge strategy 'resolve'. And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano --- Makefile | 3 ++- git-merge-resolve.sh | 38 +++-------------------------- git-merge-resolve.sh => git-merge-stupid.sh | 2 +- git-merge.sh | 6 ++--- 4 files changed, 9 insertions(+), 40 deletions(-) copy git-merge-resolve.sh => git-merge-stupid.sh (97%) diff --git a/Makefile b/Makefile index 7ef9861a7d..41461fa816 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,8 @@ SCRIPT_SH = \ git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \ git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \ git-applymbox.sh git-applypatch.sh \ - git-merge.sh git-merge-resolve.sh git-merge-octopus.sh + git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ + git-merge-resolve.sh SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index f0a19b4c8a..e3b04a0e95 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -1,8 +1,9 @@ #!/bin/sh # # Copyright (c) 2005 Linus Torvalds +# Copyright (c) 2005 Junio C Hamano # -# Resolve two trees. +# Resolve two trees, using enhancd multi-base read-tree. # The first parameters up to -- are merge bases; the rest are heads. bases= head= remotes= sep_seen= @@ -30,41 +31,8 @@ case "$remotes" in exit 2 ;; esac -# Find an optimum merge base if there are more than one candidates. -case "$bases" in -?*' '?*) - echo "Trying to find the optimum merge base." - G=.tmp-index$$ - best= - best_cnt=-1 - for c in $bases - do - rm -f $G - GIT_INDEX_FILE=$G git-read-tree -m $c $head $remotes \ - 2>/dev/null || continue - # Count the paths that are unmerged. - cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l` - if test $best_cnt -le 0 -o $cnt -le $best_cnt - then - best=$c - best_cnt=$cnt - if test "$best_cnt" -eq 0 - then - # Cannot do any better than all trivial merge. - break - fi - fi - done - rm -f $G - common="$best" - ;; -*) - common="$bases" - ;; -esac - git-update-index --refresh 2>/dev/null -git-read-tree -u -m $common $head $remotes || exit 2 +git-read-tree -u -m $bases $head $remotes || exit 2 echo "Trying simple merge." if result_tree=$(git-write-tree 2>/dev/null) then diff --git a/git-merge-resolve.sh b/git-merge-stupid.sh similarity index 97% copy from git-merge-resolve.sh copy to git-merge-stupid.sh index f0a19b4c8a..4faecb933d 100755 --- a/git-merge-resolve.sh +++ b/git-merge-stupid.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2005 Linus Torvalds # -# Resolve two trees. +# Resolve two trees, 'stupid merge'. # The first parameters up to -- are merge bases; the rest are heads. bases= head= remotes= sep_seen= diff --git a/git-merge.sh b/git-merge.sh index 9926e45d1a..55b0c7269e 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -12,10 +12,10 @@ usage () { die "git-merge [-n] [-s ]... +" } -# all_strategies='resolve multibase fredrik octopus' +# all_strategies='resolve fredrik stupid octopus' -all_strategies='resolve multibase octopus' -default_strategies='resolve multibase octopus' +all_strategies='resolve octopus stupid' +default_strategies='resolve octopus' use_strategies= dropheads() { -- 2.11.4.GIT