From: Junio C Hamano Date: Sat, 17 Sep 2005 06:38:59 +0000 (-0700) Subject: Use git-merge instead of git-resolve in git-pull. X-Git-Tag: v0.99.8~97 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f887564ab72e107bcdee3ba83c91e2bb4ae13ca7;p=git.git Use git-merge instead of git-resolve in git-pull. Signed-off-by: Junio C Hamano --- diff --git a/git-pull.sh b/git-pull.sh index 8cf39e7f6..71327a232 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -6,6 +6,38 @@ . git-sh-setup || die "Not a git archive" +usage () { + die "git pull [-n] [-s strategy]... ..." +} + +strategy_args= no_summary= +while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac +do + case "$1" in + -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ + --no-summa|--no-summar|--no-summary) + no_summary=-n ;; + -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ + --strateg=*|--strategy=*|\ + -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) + case "$#,$1" in + *,*=*) + strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;; + 1,*) + usage ;; + *) + strategy="$2" + shift ;; + esac + strategy_args="${strategy_args}-s $strategy " + ;; + -*) + usage + ;; + esac + shift +done + orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?" git-fetch --update-head-ok "$@" || exit 1 @@ -35,12 +67,6 @@ case "$merge_head" in echo >&2 "No changes." exit 0 ;; -*' '?*) - echo >&2 "Pulling more than one heads; making an Octopus." - exec git-octopus - ;; esac -git-resolve \ - "$(cat "$GIT_DIR"/HEAD)" \ - $merge_head "Merge $merge_name" +git-merge $no_summary $strategy_args "Merge $merge_name" HEAD $merge_head