GIT_SKIP_TESTS: allow users to omit tests that are known to break

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

index ed04e7d8d8753cc2cdc7d2737228cb58934534f4..28d08195f0c84b7f3a89a5c5cff9945bb64ddfb3 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -7,6 +7,7 @@
  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
+set_reflog_action "pull $*"
  
  strategy_args= no_summary= no_commit= squash=
  while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
@@ -44,10 +45,10 @@ do
         shift
  done
  
-orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?"
-git-fetch --update-head-ok --reflog-action=pull "$@" || exit 1
+orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
+git-fetch --update-head-ok "$@" || exit 1
  
-curr_head=$(git-rev-parse --verify HEAD)
+curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
  if test "$curr_head" != "$orig_head"
  then
         # The fetch involved updating the current branch.
@@ -76,32 +77,29 @@ merge_head=$(sed -e '/      not-for-merge   /d' \
  
  case "$merge_head" in
  '')
+       curr_branch=$(git-symbolic-ref HEAD | \
+               sed -e 's|^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."
         exit 0
         ;;
  ?*' '?*)
-       var=`git-repo-config --get pull.octopus`
-       if test -n "$var"
+       if test -z "$orig_head"
         then
-               strategy_default_args="-s $var"
-       fi
-       ;;
-*)
-       var=`git-repo-config --get pull.twohead`
-       if test -n "$var"
-        then
-               strategy_default_args="-s $var"
+               echo >&2 "Cannot merge multiple branches into empty head"
+               exit 1
         fi
         ;;
  esac
  
-case "$strategy_args" in
-'')
-       strategy_args=$strategy_default_args
-       ;;
-esac
+if test -z "$orig_head"
+then
+       git-update-ref -m "initial pull" HEAD $merge_head "" &&
+       git-read-tree --reset -u HEAD || exit 1
+       exit
+fi
  
  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