X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=e3d11961b0a5a7608648348153bde0ab6e7ccfff;hb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;hp=71327a23226017567b00056c9c865135b9fe84fa;hpb=b91fb518cc5c5f316ba149ceedff5ee194f44ebf;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 71327a23..e3d11961 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -6,38 +6,6 @@ . 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 @@ -57,16 +25,17 @@ then fi merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ') -merge_name=$( - perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \ - "$GIT_DIR"/FETCH_HEAD -) 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 +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") +git-resolve "$(cat "$GIT_DIR"/HEAD)" $merge_head "$merge_name"