From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 6/6] builtin-remote: prune remotes correctly that were added with --mirror
Date: Sat, 1 Mar 2008 13:17:18 +0000 (GMT) [thread overview]
Message-ID: <alpine.LSU.1.00.0803011317100.22527@racer.site> (raw)
In-Reply-To: <alpine.LSU.1.00.0803011313020.22527@racer.site>
This adds special handling for mirror remotes.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
builtin-remote.c | 15 +++++++++++++--
t/t5505-remote.sh | 16 ++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c
index 2c10df3..221d2d6 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -396,11 +396,22 @@ static int show_or_prune(int argc, const char **argv, int prune)
if (prune) {
struct strbuf buf;
+ int prefix_len;
strbuf_init(&buf, 0);
+ if (states.remote->fetch_refspec_nr == 1 &&
+ states.remote->fetch->pattern &&
+ !strcmp(states.remote->fetch->src,
+ states.remote->fetch->dst))
+ /* handle --mirror remote */
+ strbuf_addstr(&buf, "refs/heads/");
+ else
+ strbuf_addf(&buf, "refs/remotes/%s/", *argv);
+ prefix_len = buf.len;
+
for (i = 0; i < states.stale.nr; i++) {
- strbuf_reset(&buf);
- strbuf_addf(&buf, "refs/remotes/%s/%s", *argv,
+ strbuf_setlen(&buf, prefix_len);
+ strbuf_addstr(&buf,
states.stale.items[i].string);
result |= delete_ref(buf.buf, NULL);
}
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 5986982..0a25c8b 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -128,4 +128,20 @@ test_expect_success 'prune' '
! git rev-parse refs/remotes/origin/side)
'
+test_expect_success 'add --mirror && prune' '
+ (mkdir mirror &&
+ cd mirror &&
+ git init &&
+ git remote add --mirror -f origin ../one) &&
+ (cd one &&
+ git branch -m side2 side) &&
+ (cd mirror &&
+ git rev-parse --verify refs/heads/side2 &&
+ ! git rev-parse --verify refs/heads/side &&
+ git fetch origin &&
+ git remote prune origin &&
+ ! git rev-parse --verify refs/heads/side2 &&
+ git rev-parse --verify refs/heads/side)
+'
+
test_done
--
1.5.4.3.446.gbe8932
next prev parent reply other threads:[~2008-03-01 13:18 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-29 1:44 [PATCH 0/5] Builtin "git remote" Johannes Schindelin
2008-02-29 1:44 ` [PATCH 1/5] path-list: add functions to work with unsorted lists Johannes Schindelin
2008-02-29 2:04 ` Junio C Hamano
2008-02-29 2:15 ` Johannes Schindelin
2008-03-01 13:14 ` [PATCH 0/6] Builtin remote, v2 Johannes Schindelin
2008-03-01 13:15 ` [PATCH 1/6] Rename path_list to string_list Johannes Schindelin
2008-03-11 16:20 ` David Kågedal
2008-03-11 16:26 ` Johannes Schindelin
2008-03-11 16:44 ` David Kågedal
2008-03-01 13:15 ` [PATCH 2/6] string-list: add functions to work with unsorted lists Johannes Schindelin
2008-03-01 13:16 ` [PATCH 3/6] parseopt: add flag to stop on first non option Johannes Schindelin
2008-03-01 13:16 ` [PATCH 4/6] Test "git remote show" and "git remote prune" Johannes Schindelin
2008-03-01 13:16 ` [PATCH 5/6] Make git-remote a builtin Johannes Schindelin
2008-03-01 13:17 ` Johannes Schindelin [this message]
2008-02-29 1:45 ` [PATCH 2/5] parseopt: add flag to stop on first non option Johannes Schindelin
2008-02-29 1:45 ` [PATCH 3/5] Test "git remote show" and "git remote prune" Johannes Schindelin
2008-02-29 1:45 ` [PATCH 4/5] Make git-remote a builtin Johannes Schindelin
2008-02-29 1:46 ` [PATCH 5/5] builtin-remote: prune remotes correctly that were added with --mirror Johannes Schindelin
2008-02-29 1:56 ` [PATCH 0/5] Builtin "git remote" Junio C Hamano
2008-02-29 2:13 ` Johannes Schindelin
2008-02-29 2:17 ` Daniel Barkalow
2008-02-29 11:21 ` Johannes Schindelin
2008-03-02 15:15 ` Johannes Schindelin
2008-03-02 15:40 ` Johannes Schindelin
2008-03-02 15:52 ` [PATCH 0/2] format-patch --cover-letter improvements Johannes Schindelin
2008-03-02 15:53 ` [PATCH 1/2] format-patch: use the diff options for the cover letter, too Johannes Schindelin
2008-03-02 15:53 ` [PATCH 2/2] format-patch: wrap cover-letter's shortlog sensibly Johannes Schindelin
2008-03-02 17:05 ` Junio C Hamano
2008-03-02 17:38 ` Johannes Schindelin
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=alpine.LSU.1.00.0803011317100.22527@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).