[PATCH] Reorder Makefile rules

[git.git] / git-pull-script

diff --git a/git-pull-script b/git-pull-script
index 0585df6..fc46326 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,14 +1,12 @@
 #!/bin/sh
 #
-merge_repo=$1
-merge_name=${2:-HEAD}
+. git-sh-setup-script || die "Not a git archive"
+. git-parse-remote "$@"
+merge_name="$_remote_name"
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
-git-fetch-script "$merge_repo" "$merge_name"
+git-fetch-script "$@" || exit 1
 
 git-resolve-script \
        "$(cat "$GIT_DIR"/HEAD)" \
-       "$(cat "$GIT_DIR"/MERGE_HEAD)" \
-       "$merge_repo"
+       "$(cat "$GIT_DIR"/FETCH_HEAD)" \
+       "Merge $merge_name"