diff options
| author | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-09-30 01:41:47 +0400 |
|---|---|---|
| committer | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-09-30 01:41:47 +0400 |
| commit | 09dea56568f90952b87d29353aca53359157cd29 (patch) | |
| tree | 7b3ee5ef9f44dfae2c7a7c59999f266ea90d62bd | |
| parent | fef1ef8e1b87f28f019bf973547644e41f4be7cd (diff) | |
| parent | 60fb5b2c4d9e26204f480f8a18ae1ff0051a6440 (diff) | |
Merge with master.kernel.org:/pub/scm/git/git.git
| -rwxr-xr-x | git-pull.sh | 48 |
1 files changed, 44 insertions, 4 deletions
diff --git a/git-pull.sh b/git-pull.sh index 1f4a05d09e..0290e517c2 100755 --- 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=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?" git-fetch --update-head-ok "$@" || exit 1 @@ -33,11 +65,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 $strategy_args "$merge_name" HEAD $merge_head |