[PATCH 2/2] builtin-remote: make rm operation safer in mirrored repository
- From
Jay Soffian <jaysoffian@gmail.com>
- Date
- Feb 3, 2009, 17:51 UTC
- Message-ID
- <1233683473-87893-2-git-send-email-jaysoffian@gmail.com>
- In-Reply-To
- <1233683473-87893-1-git-send-email-jaysoffian@gmail.com>
"git remote rm <repo>" is happy to remove non-remote branches (and their reflogs). This may be okay if the repository truely is a mirror, but if the user had done "git remote add --mirror <repo>" by accident and was just undoing their mistake, then they are left in a situation that is difficult to recover from.
After this commit, "git remote rm" skips over non-remote branches and instead advises the user on how to remove such branches using "git branch -d", which itself has nice safety checks wrt to branch removal lacking from "git remote rm".
Signed-off-by: Jay Soffian <jaysoffian@gmail.com> ---
On Tue, Feb 3, 2009 at 2:54 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 18 quoted lines
> Jeff King <peff@peff.net> writes: >> However, I have one small nit. The output produces long lines with a lot >> of repeated text (assuming you have multiple matched branches, which is >> likely if you have a mirrored setup). So maybe it would be nicer to have >> something like: >> >> warning: non-remote branches were not removed; you can delete them with: >> git branch -d master >> git branch -d next >> git branch -d topic >> >> which is a little more obvious (to me, anyway), and allows you to cut >> and paste if you really did want to delete them. > > Thanks for a review, and I actually shared that exact nit when I first > read the patch. It would be a very good change to collect them in a list > and show a single warning at the end (I do not have particular preference > about the cut & paste-ability either way myself).
So much work for what seemed such a minor change. :) I hope this version is well-polished enough.
builtin-remote.c | 27 +++++++++++++++++++++++++-- t/t5505-remote.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c index 21885fb..ae1eed4 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -298,7 +298,7 @@ static int add_known_remote(struct remote *remote, void *cb_data) struct branches_for_remote { struct remote *remote; - struct string_list *branches; + struct string_list *branches, *skipped; struct known_remotes *keep; }; @@ -323,6 +323,14 @@ static int add_branch_for_removal(const char *refname, return 0; } + /* don't delete non-remote branches */ + if (prefixcmp(refname, "refs/remotes")) { + if (!prefixcmp(refname, "refs/heads/")) + string_list_append(abbrev_branch(refname), + branches->skipped); + return 0; + } + /* make sure that symrefs are deleted */ if (flags & REF_ISSYMREF) return unlink(git_path("%s", refname)); @@ -542,7 +550,10 @@ static int rm(int argc, const char **argv) struct strbuf buf = STRBUF_INIT; struct known_remotes known_remotes = { NULL, NULL }; struct string_list branches = { NULL, 0, 0, 1 }; - struct branches_for_remote cb_data = { NULL, &branches, &known_remotes }; + struct string_list skipped = { NULL, 0, 0, 1 }; + struct branches_for_remote cb_data = { + NULL, &branches, &skipped, &known_remotes + }; int i, result; if (argc != 2) @@ -590,6 +601,18 @@ static int rm(int argc, const char **argv) result = remove_branches(&branches); string_list_clear(&branches, 1); + if (skipped.nr) { + fprintf(stderr, skipped.nr == 1 ? + "Note: A non-remote branch was not removed; " + "to delete it, use:\n" : + "Note: Non-remote branches were not removed; " + "to delete them, use:\n"); + for (i = 0; i < skipped.nr; i++) + fprintf(stderr, " git branch -d %s\n", + skipped.items[i].string); + } + string_list_clear(&skipped, 0); + return result; } diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 1f59960..bc5b7ce 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -107,6 +107,32 @@ test_expect_success 'remove remote' ' ) ' +test_expect_success 'remove remote protects non-remote branches' ' +( + cd test && + (cat >expect1 <<EOF +Note: A non-remote branch was not removed; to delete it, use: + git branch -d master +EOF + cat >expect2 <<EOF +Note: Non-remote branches were not removed; to delete them, use: + git branch -d foobranch + git branch -d master +EOF +) && + git tag footag + git config --add remote.oops.fetch "+refs/*:refs/*" && + git remote rm oops 2>actual1 && + git branch foobranch && + git config --add remote.oops.fetch "+refs/*:refs/*" && + git remote rm oops 2>actual2 && + git branch -d foobranch && + git tag -d footag && + test_cmp expect1 actual1 && + test_cmp expect2 actual2 +) +' + cat > test/expect << EOF * remote origin URL: $(pwd)/one
-- 1.6.1.2.311.g2d7f3