Recover dropped +x bit from git-pull.sh by accident.

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

index e3d1196..2358af6 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -6,10 +6,55 @@
  
  . git-sh-setup || die "Not a git archive"
  
-orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
+usage () {
+    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= 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)
+               case "$#,$1" in
+               *,*=*)
+                       strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
+               1,*)
+                       usage ;;
+               *)
+                       strategy="$2"
+                       shift ;;
+               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=$(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.
@@ -24,18 +69,28 @@ then
                 die "You need to first update your working tree."
  fi
  
-merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
+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
         ;;
-*' '?*)
-       echo >&2 "Pulling more than one heads; making an Octopus."
-       exec git-octopus
+?*' '?*)
+       strategy_default_args='-s octopus'
+       ;;
+*)
+       strategy_default_args='-s resolve'
+       ;;
+esac
+
+case "$strategy_args" in
+'')
+       strategy_args=$strategy_default_args
         ;;
  esac
  
  merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
-git-resolve "$(cat "$GIT_DIR"/HEAD)" $merge_head "$merge_name"
+git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head