git-tar-tree: no more void pointer arithmetic

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

index 0290e51..4611ae6 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -4,19 +4,19 @@
  #
  # Fetch one or more remote refs and merge it/them into the current HEAD.
  
-. git-sh-setup || die "Not a git archive"
+USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
+LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
+. git-sh-setup
  
-usage () {
-    die "git pull [-n] [-s strategy]... <repo> <head>..."
-}
-
-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,9 +31,13 @@ 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
@@ -51,9 +55,17 @@ then
         # First update the working tree to match $curr_head.
  
         echo >&2 "Warning: fetch updated the current branch head."
-       echo >&2 "Warning: fast forwarding your working tree."
+       echo >&2 "Warning: fast forwarding your working tree from"
+       echo >&2 "Warning: $orig_head commit."
+       git-update-index --refresh 2>/dev/null
         git-read-tree -u -m "$orig_head" "$curr_head" ||
-               die "You need to first update your working tree."
+               die 'Cannot fast-forward your working tree.
+After making sure that you saved anything precious from
+$ git diff '$orig_head'
+output, run
+$ git reset --hard
+to recover.'
+
  fi
  
  merge_head=$(sed -e '/ not-for-merge   /d' \
@@ -66,10 +78,18 @@ case "$merge_head" in
         exit 0
         ;;
  ?*' '?*)
-       strategy_default_args='-s octopus'
+       var=`git-repo-config --get pull.octopus`
+       if test -n "$var"
+       then
+               strategy_default_args="-s $var"
+       fi
         ;;
  *)
-       strategy_default_args='-s resolve'
+       var=`git-repo-config --get pull.twohead`
+       if test -n "$var"
+        then
+               strategy_default_args="-s $var"
+       fi
         ;;
  esac
  
@@ -80,4 +100,4 @@ case "$strategy_args" in
  esac
  
  merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
-git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head
+git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head