undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use git-merge in git-pull (second try).

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-09-25 19:43:51 -07:00
parent bf7960eb51
commit 60fb5b2c4d
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
git-pull.sh
View File

@ -6,6 +6,38 @@
. git-sh-setup || die "Not a git archive" . 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?" orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?"
git-fetch --update-head-ok "$@" || exit 1 git-fetch --update-head-ok "$@" || exit 1
@ -33,11 +65,19 @@ case "$merge_head" in
echo >&2 "No changes." echo >&2 "No changes."
exit 0 exit 0
;; ;;
*' '?*) ?*' '?*)
echo >&2 "Pulling more than one heads; making an Octopus." strategy_default_args='-s octopus'
exec git-octopus ;;
*)
strategy_default_args='-s resolve'
;;
esac
case "$strategy_args" in
'')
strategy_args=$strategy_default_args
;; ;;
esac esac
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") 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