X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-fetch-script;h=fb4a53776ac0f3f5d95e4c4b6a68ab0b3913974c;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=2e62f001b189249243ad27b88bf8357526095f14;hpb=6b38a402e97274037982a5346ca4168cc8ee026c;p=git.git diff --git a/git-fetch-script b/git-fetch-script index 2e62f001..fb4a5377 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -1,7 +1,13 @@ #!/bin/sh # +destination=FETCH_HEAD + merge_repo=$1 merge_name=${2:-HEAD} +if [ "$2" = "tag" ]; then + merge_name="refs/tags/$3" + destination="$merge_name" +fi : ${GIT_DIR=.git} : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"} @@ -35,7 +41,7 @@ download_objects () { } echo "Getting remote $merge_name" -download_one "$merge_repo/$merge_name" "$GIT_DIR"/FETCH_HEAD || exit 1 +download_one "$merge_repo/$merge_name" "$GIT_DIR/$destination" || exit 1 echo "Getting object database" -download_objects "$merge_repo" "$(cat "$GIT_DIR"/FETCH_HEAD)" || exit 1 +download_objects "$merge_repo" "$(cat "$GIT_DIR/$destination")" || exit 1