[PATCH] Finish initial cut of git-pack-object/git-unpack-object pair.

diff --git a/git-pull-script b/git-pull-script
index 0585df61e241b302cf007cd75dd6e9fd3b78596a..90ee0f322d8c569a5b02b3be1548eb990b4263c9 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,14 +1,21 @@
 #!/bin/sh
 #
 merge_repo=$1
-merge_name=${2:-HEAD}
+
+merge_name=$(echo "$1" | sed 's:\.git/*$::')
+merge_head=HEAD
+if [ "$2" ]
+then
+   merge_name="'$2' branch of $merge_name"
+   merge_head="refs/heads/$2"
+fi
 
 : ${GIT_DIR=.git}
 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-git-fetch-script "$merge_repo" "$merge_name"
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
        "$(cat "$GIT_DIR"/HEAD)" \
-       "$(cat "$GIT_DIR"/MERGE_HEAD)" \
-       "$merge_repo"
+       "$(cat "$GIT_DIR"/FETCH_HEAD)" \
+       "$merge_name"