X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=d4765188b4ad9d41a0ffec333d9b449de03968a6;hb=e24317b4d093e4b148996172d0b749f09a0e6f2e;hp=dd36c615b60665d128e9dc07c3988d9f2bac3878;hpb=c80522e30fdc190f8c8c7fc983bbe040a1b03e93;p=git.git diff --git a/git-pull.sh b/git-pull.sh index dd36c615..d4765188 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -6,10 +6,43 @@ . git-sh-setup || die "Not a git archive" -orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?" +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 " + ;; + -*) + # Pass thru anything that is meant for fetch. + break + ;; + esac + shift +done + +orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?" git-fetch --update-head-ok "$@" || exit 1 -curr_head=$(cat "$GIT_DIR/HEAD") +curr_head=$(git-rev-parse --verify HEAD) if test "$curr_head" != "$orig_head" then # The fetch involved updating the current branch. @@ -24,23 +57,28 @@ then die "You need to first update your working tree." fi -merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD) -merge_name=$( - perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \ - "$GIT_DIR"/FETCH_HEAD -) +merge_head=$(sed -e '/ not-for-merge /d' \ + -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \ + tr '\012' ' ') case "$merge_head" in '') echo >&2 "No changes." exit 0 ;; -*' '?*) - echo >&2 "Pulling more than one heads; making an Octopus." - exec git-octopus +?*' '?*) + strategy_default_args='-s octopus' + ;; +*) + strategy_default_args='-s resolve' + ;; +esac + +case "$strategy_args" in +'') + strategy_args=$strategy_default_args ;; esac -git-resolve \ - "$(cat "$GIT_DIR"/HEAD)" \ - $merge_head "Merge $merge_name" +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") +git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head