summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-21 21:01:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-21 21:01:56 (GMT)
commitacfadcfb48e34fdc441e9cffbb385fce9693b363 (patch)
tree2aaafd05b4c530754840d6065ea840261fc7c751 /git-pull.sh
parentb91fb518cc5c5f316ba149ceedff5ee194f44ebf (diff)
downloadgit-acfadcfb48e34fdc441e9cffbb385fce9693b363.zip
git-acfadcfb48e34fdc441e9cffbb385fce9693b363.tar.gz
git-acfadcfb48e34fdc441e9cffbb385fce9693b363.tar.bz2
Revert "Use git-merge instead of git-resolve in git-pull."
This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh40
1 files changed, 7 insertions, 33 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 71327a2..8cf39e7 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -6,38 +6,6 @@
. git-sh-setup || die "Not a git archive"
-usage () {
- die "git pull [-n] [-s strategy]... <repo> <head>..."
-}
-
-strategy_args= no_summary=
-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 ;;
- -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 "
- ;;
- -*)
- usage
- ;;
- esac
- shift
-done
-
orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
git-fetch --update-head-ok "$@" || exit 1
@@ -67,6 +35,12 @@ case "$merge_head" in
echo >&2 "No changes."
exit 0
;;
+*' '?*)
+ echo >&2 "Pulling more than one heads; making an Octopus."
+ exec git-octopus
+ ;;
esac
-git-merge $no_summary $strategy_args "Merge $merge_name" HEAD $merge_head
+git-resolve \
+ "$(cat "$GIT_DIR"/HEAD)" \
+ $merge_head "Merge $merge_name"