diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-25 19:43:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-29 00:24:41 -0700 |
| commit | 60fb5b2c4d9e26204f480f8a18ae1ff0051a6440 (patch) | |
| tree | a05853f1c4566d06f279267fdf783efe35f355e7 | |
| parent | bf7960eb51a26bcf52f27a60bfcf005661266b1e (diff) | |
| download | git-60fb5b2c4d9e26204f480f8a18ae1ff0051a6440.tar.gz git-60fb5b2c4d9e26204f480f8a18ae1ff0051a6440.tar.xz | |
Use git-merge in git-pull (second try).
This again makes git-pull to use git-merge, so that different merge
strategy can be specified from the command line. Without explicit
strategy parameter, it defaults to git-merge-resolve if only one
remote is pulled, and git-merge-octopus otherwise, to keep the
default behaviour of the command the same as the original.
Also this brings another usability measure: -n flag from the command
line, if given, is passed to git-merge to prevent it from running the
diffstat at the end of the merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -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 1f4a05d09..0290e517c 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 |