undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow git-merge to select the default strategy.

Browse Source 
Now that git-merge knows how to use the pull.{twohead,octopus}
configuration options to select the default merge strategy there
is no reason for git-pull to do the same immediately prior to
invoking git-merge.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2006-12-28 02:35:11 -05:00 committed by Junio C Hamano
parent de811948ba
commit 6b5a795bf5
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-pull.sh
View File

@ -90,18 +90,6 @@ case "$merge_head" in
echo >&2 "Cannot merge multiple branches into empty head" echo >&2 "Cannot merge multiple branches into empty head"
exit 1 exit 1
fi fi
var=`git-repo-config --get pull.octopus`
if test -n "$var"
then
strategy_default_args="-s $var"
fi
;;
*)
var=`git-repo-config --get pull.twohead`
if test -n "$var"
then
strategy_default_args="-s $var"
fi
;; ;;
esac esac
@ -112,12 +100,6 @@ then
exit exit
fi fi
case "$strategy_args" in
'')
strategy_args=$strategy_default_args
;;
esac
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
exec git-merge $no_summary $no_commit $squash $strategy_args \ exec git-merge $no_summary $no_commit $squash $strategy_args \
"$merge_name" HEAD $merge_head "$merge_name" HEAD $merge_head