projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up git-diff-tree 'header' generation
[git.git]
/
git-fetch-script
diff --git
a/git-fetch-script
b/git-fetch-script
index
17f22af
..
fb4a537
100755
(executable)
--- a/
git-fetch-script
+++ b/
git-fetch-script
@@
-1,7
+1,13
@@
#!/bin/sh
#
#!/bin/sh
#
+destination=FETCH_HEAD
+
merge_repo=$1
merge_name=${2:-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"}"}
: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
@@
-35,7
+41,7
@@
download_objects () {
}
echo "Getting remote $merge_name"
}
echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" "$GIT_DIR
"/MERGE_HEAD
+download_one "$merge_repo/$merge_name" "$GIT_DIR
/$destination" || exit 1
echo "Getting object database"
echo "Getting object database"
-download_objects "$merge_repo" "$(cat "$GIT_DIR
"/MERGE_HEAD)"
+download_objects "$merge_repo" "$(cat "$GIT_DIR
/$destination")" || exit 1