projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 27cfe2e)
Use git-merge instead of git-resolve in git-pull.
authorJunio C Hamano <junkio@cox.net>
Sat, 17 Sep 2005 06:38:59 +0000 (23:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 01:16:27 +0000 (18:16 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh patch | blob | history

diff --git a/git-pull.sh b/git-pull.sh
index 8cf39e7f6495925c9f9824ebea518810554ba12b..71327a23226017567b00056c9c865135b9fe84fa 100755 (executable)
--- 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]... <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
 
@@ -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
Git—the stupid content tracker