Add functions git_config_set() and git_config_set_multivar()

[git.git] / git-pull.sh
diff --git a/git-pull.sh b/git-pull.sh

index 71327a2..3b875ad 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -7,16 +7,25 @@
  . git-sh-setup || die "Not a git archive"
  
  usage () {
-    die "git pull [-n] [-s strategy]... <repo> <head>..."
+    echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help]
+    [-s strategy]...
+    [<fetch-options>]
+    <repo> <head>...
+
+Fetch one or more remote refs and merge it/them into the current HEAD.
+'
+    exit 1
  }
  
-strategy_args= no_summary=
+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)
@@ -31,17 +40,21 @@ do
                 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=$(cat "$GIT_DIR/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
  
-curr_head=$(cat "$GIT_DIR/HEAD")
+curr_head=$(git-rev-parse --verify HEAD)
  if test "$curr_head" != "$orig_head"
  then
         # The fetch involved updating the current branch.
@@ -56,17 +69,40 @@ then
                 die "You need to first update your working tree."
  fi
  
-merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
-merge_name=$(
-    perl -e 'print join("; ", map { chomp; s/^[0-9a-f]*        //; $_ } <>)' \
-    "$GIT_DIR"/FETCH_HEAD
-)
+merge_head=$(sed -e '/ not-for-merge   /d' \
+       -e 's/  .*//' "$GIT_DIR"/FETCH_HEAD | \
+       tr '\012' ' ')
  
  case "$merge_head" in
  '')
         echo >&2 "No changes."
         exit 0
         ;;
+?*' '?*)
+       var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'`
+       if test '' = "$var"
+       then
+               strategy_default_args='-s octopus'
+       else
+               strategy_default_args=$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
+       fi
+       ;;
+esac
+
+case "$strategy_args" in
+'')
+       strategy_args=$strategy_default_args
+       ;;
  esac
  
-git-merge $no_summary $strategy_args "Merge $merge_name" HEAD $merge_head
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
+git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head