Document additional options for git-fetch

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

index 1703091bbb988e22f39b2c8d4c70ec7340a2f109..a3665d7751cc836dc669390df7b972c29575037b 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -6,7 +6,14 @@
  
  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.'
+SUBDIRECTORY_OK=Yes
  . git-sh-setup
+set_reflog_action "pull $*"
+require_work_tree
+cd_to_toplevel
+
+test -z "$(git ls-files -u)" ||
+       die "You are in the middle of a conflicted merge."
  
  strategy_args= no_summary= no_commit= squash=
  while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
@@ -45,7 +52,7 @@ do
  done
  
  orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
-git-fetch --update-head-ok --reflog-action=pull "$@" || exit 1
+git-fetch --update-head-ok "$@" || exit 1
  
  curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
  if test "$curr_head" != "$orig_head"
@@ -76,8 +83,17 @@ merge_head=$(sed -e '/       not-for-merge   /d' \
  
  case "$merge_head" in
  '')
-       curr_branch=$(git-symbolic-ref HEAD | \
-               sed -e 's|^refs/heads/||')
+       curr_branch=$(git-symbolic-ref -q HEAD)
+       case $? in
+         0) ;;
+         1) echo >&2 "You are not currently on a branch; you must explicitly"
+            echo >&2 "specify which branch you wish to merge:"
+            echo >&2 "  git pull <remote> <branch>"
+            exit 1;;
+         *) exit $?;;
+       esac
+       curr_branch=${curr_branch#refs/heads/}
+
         echo >&2 "Warning: No merge candidate found because value of config option
           \"branch.${curr_branch}.merge\" does not match any remote branch fetched."
         echo >&2 "No changes."
@@ -89,18 +105,6 @@ case "$merge_head" in
                 echo >&2 "Cannot merge multiple branches into empty head"
                 exit 1
         fi
-       var=`git-repo-config --get pull.octopus`
-       if test -n "$var"
-       then
-               strategy_default_args="-s $var"
-       fi
-       ;;
-*)
-       var=`git-repo-config --get pull.twohead`
-       if test -n "$var"
-        then
-               strategy_default_args="-s $var"
-       fi
         ;;
  esac
  
@@ -111,13 +115,6 @@ then
         exit
  fi
  
-case "$strategy_args" in
-'')
-       strategy_args=$strategy_default_args
-       ;;
-esac
-
  merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
-git-merge "--reflog-action=pull $*" \
-       $no_summary $no_commit $squash $strategy_args \
+exec git-merge $no_summary $no_commit $squash $strategy_args \
         "$merge_name" HEAD $merge_head