summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:40 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:41 -0700
commit55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38 (patch)
tree02db41e2c308c62a2b8bcc01f1849fef08571214 /transport.c
parent212ca64fb4a50178bf8a83c7b1bab15da5c9ab4c (diff)
parentc2aba155da10b8bc9f867d2f0ac0e63cc8dae1a4 (diff)
downloadgit-55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38.tar.gz
Merge branch 'jc/push-follow-tag'
The new "--follow-tags" option tells "git push" to push relevant annotated tags when pushing branches out. * jc/push-follow-tag: push: --follow-tags commit.c: use clear_commit_marks_many() in in_merge_bases_many() commit.c: add in_merge_bases_many() commit.c: add clear_commit_marks_many()
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/transport.c b/transport.c
index 42a61b30b3..eb9eb33e0f 100644
--- a/transport.c
+++ b/transport.c
@@ -1128,6 +1128,8 @@ int transport_push(struct transport *transport,
match_flags |= MATCH_REFS_MIRROR;
if (flags & TRANSPORT_PUSH_PRUNE)
match_flags |= MATCH_REFS_PRUNE;
+ if (flags & TRANSPORT_PUSH_FOLLOW_TAGS)
+ match_flags |= MATCH_REFS_FOLLOW_TAGS;
if (match_push_refs(local_refs, &remote_refs,
refspec_nr, refspec, match_flags)) {