зеркало из https://github.com/microsoft/git.git
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 <junkio@cox.net>
This commit is contained in:
Junio C Hamano
Родитель
91063bbc6c
Коммит
2276aa6c09
3
Makefile
3
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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,80 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2005 Linus Torvalds
|
||||
#
|
||||
# Resolve two trees, 'stupid merge'.
|
||||
|
||||
# The first parameters up to -- are merge bases; the rest are heads.
|
||||
bases= head= remotes= sep_seen=
|
||||
for arg
|
||||
do
|
||||
case ",$sep_seen,$head,$arg," in
|
||||
*,--,)
|
||||
sep_seen=yes
|
||||
;;
|
||||
,yes,,*)
|
||||
head=$arg
|
||||
;;
|
||||
,yes,*)
|
||||
remotes="$remotes$arg "
|
||||
;;
|
||||
*)
|
||||
bases="$bases$arg "
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Give up if we are given more than two remotes -- not handling octopus.
|
||||
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
|
||||
echo "Trying simple merge."
|
||||
if result_tree=$(git-write-tree 2>/dev/null)
|
||||
then
|
||||
exit 0
|
||||
else
|
||||
echo "Simple merge failed, trying Automatic merge."
|
||||
if git-merge-index -o git-merge-one-file -a
|
||||
then
|
||||
exit 0
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -12,10 +12,10 @@ usage () {
|
|||
die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
|
||||
}
|
||||
|
||||
# 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() {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче