X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-pull.sh;h=17fda26721b7203faffd68bd178d5b757252d4d8;hb=c816a6bc5a8494556e00c36d4ed4596a04efd38a;hp=3a139849fbfc545b7c479dd2889a0285fab646d5;hpb=ae2b0f15180d4b044828c836bcab6a990efa5c8e;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 3a139849f..17fda2672 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,19 +4,10 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. +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 -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 @@ -79,21 +70,17 @@ case "$merge_head" in exit 0 ;; ?*' '?*) - var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'` - if test '' = "$var" + var=`git repo-config --get pull.octopus` + if test -n "$var" then - strategy_default_args='-s octopus' - else - strategy_default_args=$var + strategy_default_args="-s $var" fi ;; *) - var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'` - if test '' = "$var" - then - strategy_default_args='-s recursive' - else - strategy_default_args=$var + var=`git repo-config --get pull.twohead` + if test -n "$var" + then + strategy_default_args="-s $var" fi ;; esac