aboutsummaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-26 23:05:45 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-26 23:05:45 -0800
commitd365a432271d2f6384cda9c37fb2fe463bdc2850 (patch)
tree56fa405031b5951038d2d0189f4ac84b3801b0cb /transport.c
parent5419127d0475a78983696544ca5e672e8ea4075d (diff)
parent6ddba5e241ebe484d53e3573c72386f487e25697 (diff)
downloadgit-d365a432271d2f6384cda9c37fb2fe463bdc2850.tar.gz
git-d365a432271d2f6384cda9c37fb2fe463bdc2850.tar.xz
Merge branch 'fc/push-prune'
* fc/push-prune: push: add '--prune' option remote: refactor code into alloc_delete_ref() remote: reorganize check_pattern_match() remote: use a local variable in match_push_refs() Conflicts: builtin/push.c
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 401b8dd35..181f8f24d 100644
--- a/transport.c
+++ b/transport.c
@@ -1032,6 +1032,8 @@ int transport_push(struct transport *transport,
match_flags |= MATCH_REFS_ALL;
if (flags & TRANSPORT_PUSH_MIRROR)
match_flags |= MATCH_REFS_MIRROR;
+ if (flags & TRANSPORT_PUSH_PRUNE)
+ match_flags |= MATCH_REFS_PRUNE;
if (match_push_refs(local_refs, &remote_refs,
refspec_nr, refspec, match_flags)) {