[PATCH] Make "git pull" and "git fetch" default to origin

diff --git a/git-pull-script b/git-pull-script
index 961edc481b96b0081c816520bc0c4e2cfe5a43f8..8608fcdebc1be7917de38740b3264edf5e0998ec 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,26 +1,16 @@
 #!/bin/sh
 #
-merge_repo=$1
+. git-sh-setup-script || die "Not a git archive"
+git-fetch-script "$@" || exit 1
+merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
+merge_name=$(sed -e 's/^[0-9a-f]*      //' "$GIT_DIR"/FETCH_HEAD |
+        tr '\012' ' ')
 
-merge_name=$(echo "$1" | sed 's:\.git/*$::')
-merge_head=HEAD
-type=head
-if [ "$2" = "tag" ]; then
-   type=tag
-   shift
-fi
-if [ "$2" ]
-then
-   merge_name="$type '$2' of $merge_name"
-   merge_head="refs/${type}s/$2"
-fi
+case "$merge_head" in
+'' | *' '?*) die "Cannot resolve multiple heads at the same time (yet)." ;;
+esac
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
-git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
        "$(cat "$GIT_DIR"/HEAD)" \
-       "$(cat "$GIT_DIR"/FETCH_HEAD)" \
-       "$merge_name"
+       $merge_head "Merge $merge_name"