X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=2358af62d5eb008ef3d04de67cea7a56aab16526;hb=31b9755a655aa34373d8b39030e9a0f46ffa0078;hp=1f4a05d09eed7a7ae6be9ce4dcdd92f4e0d75131;hpb=0542f48c894f924d94a2bd05f7e4cbab25656112;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 1f4a05d0..2358af62 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -6,6 +6,51 @@ . git-sh-setup || die "Not a git archive" +usage () { + echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help] + [-s strategy]... + [] + ... + +Fetch one or more remote refs and merge it/them into the current HEAD. +' + exit 1 +} + +strategy_args= no_summary= no_commit= +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 ;; + --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) + no_commit=--no-commit ;; + -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 " + ;; + -h|--h|--he|--hel|--help) + usage + ;; + -*) + # 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 @@ -33,11 +78,19 @@ 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 merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") -git-resolve "$curr_head" $merge_head "$merge_name" +git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head