X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-pull.sh;h=4611ae644e08e4ab115633ab86f1f02976663169;hp=1f4a05d09eed7a7ae6be9ce4dcdd92f4e0d75131;hb=HEAD;hpb=bf7960eb51a26bcf52f27a60bfcf005661266b1e diff --git a/git-pull.sh b/git-pull.sh index 1f4a05d0..4611ae64 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,7 +4,43 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. -. git-sh-setup || die "Not a git archive" +USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [] ...' +LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' +. git-sh-setup + +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 @@ -19,9 +55,17 @@ then # First update the working tree to match $curr_head. echo >&2 "Warning: fetch updated the current branch head." - echo >&2 "Warning: fast forwarding your working tree." + echo >&2 "Warning: fast forwarding your working tree from" + echo >&2 "Warning: $orig_head commit." + git-update-index --refresh 2>/dev/null git-read-tree -u -m "$orig_head" "$curr_head" || - die "You need to first update your working tree." + die 'Cannot fast-forward your working tree. +After making sure that you saved anything precious from +$ git diff '$orig_head' +output, run +$ git reset --hard +to recover.' + fi merge_head=$(sed -e '/ not-for-merge /d' \ @@ -33,11 +77,27 @@ case "$merge_head" in echo >&2 "No changes." exit 0 ;; -*' '?*) - echo >&2 "Pulling more than one heads; making an Octopus." - exec git-octopus +?*' '?*) + var=`git-repo-config --get pull.octopus` + if test -n "$var" + then + strategy_default_args="-s $var" + fi + ;; +*) + var=`git-repo-config --get pull.twohead` + if test -n "$var" + then + strategy_default_args="-s $var" + fi + ;; +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