From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
To: git@vger.kernel.org
Cc: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Subject: [PATCH] remote: make prune work for mixed mirror/non-mirror repos
Date: Fri, 21 Jun 2013 00:11:44 +0200 [thread overview]
Message-ID: <1371766304-4601-1-git-send-email-dennis@kaarsemaker.net> (raw)
In-Reply-To: <1371763424.17896.32.camel@localhost>
When cloning a repo with --mirror, and adding more remotes later,
get_stale_heads for origin would mark all refs from other repos as stale. In
this situation, with refs-src and refs->dst both equal to refs/*, we should
ignore refs/remotes/* when looking for stale refs to prevent this from
happening.
Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
---
remote.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/remote.c b/remote.c
index e71f66d..863c183 100644
--- a/remote.c
+++ b/remote.c
@@ -1884,6 +1884,7 @@ struct stale_heads_info {
struct ref **stale_refs_tail;
struct refspec *refs;
int ref_count;
+ int ignore_remotes;
};
static int get_stale_heads_cb(const char *refname,
@@ -1903,7 +1904,8 @@ static int get_stale_heads_cb(const char *refname,
* remote we consider it to be stale.
*/
if (!((flags & REF_ISSYMREF) ||
- string_list_has_string(info->ref_names, query.src))) {
+ string_list_has_string(info->ref_names, query.src) ||
+ (info->ignore_remotes && !prefixcmp(refname, "refs/remotes/")))) {
struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
hashcpy(ref->new_sha1, sha1);
}
@@ -1917,6 +1919,8 @@ struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fet
struct ref *ref, *stale_refs = NULL;
struct string_list ref_names = STRING_LIST_INIT_NODUP;
struct stale_heads_info info;
+ if(!strcmp(refs->src, "refs/*") && !strcmp(refs->dst, "refs/*"))
+ info.ignore_remotes = 1;
info.ref_names = &ref_names;
info.stale_refs_tail = &stale_refs;
info.refs = refs;
--
1.8.3.1-619-gbec0aa7
next prev parent reply other threads:[~2013-06-20 22:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-20 21:23 [BUG?] remote prune origin interacts badly with clone --mirror and multiple remotes Dennis Kaarsemaker
2013-06-20 22:11 ` Dennis Kaarsemaker [this message]
2013-06-20 22:46 ` [PATCH] remote: make prune work for mixed mirror/non-mirror repos Junio C Hamano
2013-06-20 23:07 ` Dennis Kaarsemaker
2013-06-20 23:30 ` Junio C Hamano
2013-06-20 23:38 ` Dennis Kaarsemaker
2013-06-20 23:44 ` Junio C Hamano
2013-06-20 23:08 ` Jeff King
2013-06-20 23:29 ` Dennis Kaarsemaker
2013-06-20 23:36 ` Junio C Hamano
2013-06-20 22:53 ` [PATCH v2] " Dennis Kaarsemaker
2013-06-21 10:04 ` [PATCH 0/3] Handling overlapping refspecs slightly smarter Dennis Kaarsemaker
2013-06-21 10:04 ` [PATCH 1/3] remote: Add warnings about mixin --mirror and other remotes Dennis Kaarsemaker
2013-06-21 18:42 ` Junio C Hamano
2013-06-23 13:35 ` Dennis Kaarsemaker
2013-06-23 21:22 ` Junio C Hamano
2013-06-23 21:43 ` Dennis Kaarsemaker
2013-06-23 22:33 ` Junio C Hamano
2013-06-26 21:10 ` Dennis Kaarsemaker
2013-06-26 23:42 ` Junio C Hamano
2013-06-21 10:04 ` [PATCH 2/3] remote: Add test for prune and mixed --mirror and normal remotes Dennis Kaarsemaker
2013-06-21 10:04 ` [PATCH 3/3] remote: don't prune when detecting overlapping refspecs Dennis Kaarsemaker
2013-06-21 18:53 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371766304-4601-1-git-send-email-dennis@kaarsemaker.net \
--to=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).