summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 03:10:32 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 03:10:32 (GMT)
commit635f67f9437b104be852cadb645006f4e858421f (patch)
treebe57c7f9338935e94f390ff98626cf3d12dca3eb
parentd6771bd0608e2d141d33c9e2024a4cf03043ef94 (diff)
downloadgit-635f67f9437b104be852cadb645006f4e858421f.zip
git-635f67f9437b104be852cadb645006f4e858421f.tar.gz
git-635f67f9437b104be852cadb645006f4e858421f.tar.bz2
Teach git-pull-script about pulling tags
-rwxr-xr-xgit-pull-script9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-pull-script b/git-pull-script
index 90ee0f3..4ec12bd 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -4,10 +4,15 @@ merge_repo=$1
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="'$2' branch of $merge_name"
- merge_head="refs/heads/$2"
+ merge_name="$type '$2' of $merge_name"
+ merge_head="refs/{$type}s/$2"
fi
: ${GIT_DIR=.git}