Code

Revert "Use git-merge instead of git-resolve in git-pull."
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700)
git-pull.sh

index 71327a23226017567b00056c9c865135b9fe84fa..8cf39e7f6495925c9f9824ebea518810554ba12b 100755 (executable)
@@ -6,38 +6,6 @@
 
 . git-sh-setup || die "Not a git archive"
 
-usage () {
-    die "git pull [-n] [-s strategy]... <repo> <head>..."
-}
-
-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
 
@@ -67,6 +35,12 @@ 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-merge $no_summary $strategy_args "Merge $merge_name" HEAD $merge_head
+git-resolve \
+       "$(cat "$GIT_DIR"/HEAD)" \
+       $merge_head "Merge $merge_name"