From e02f1762b257c50124fc528e8b60bf16e8bb7acf Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Tue, 3 Feb 2009 12:51:12 -0500 Subject: builtin-remote: make rm() use properly named variable to hold return value "i" is a loop counter and should not be used to hold a return value; use "result" instead which is consistent with the rest of builtin-remote.c. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano --- builtin-remote.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'builtin-remote.c') diff --git a/builtin-remote.c b/builtin-remote.c index 5af4e643eb..9ccc8a90e9 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -356,7 +356,7 @@ static int rm(int argc, const char **argv) 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 }; - int i; + int i, result; if (argc != 2) usage_with_options(builtin_remote_usage, options); @@ -397,14 +397,14 @@ static int rm(int argc, const char **argv) * refs, which are invalidated when deleting a branch. */ cb_data.remote = remote; - i = for_each_ref(add_branch_for_removal, &cb_data); + result = for_each_ref(add_branch_for_removal, &cb_data); strbuf_release(&buf); - if (!i) - i = remove_branches(&branches); + if (!result) + result = remove_branches(&branches); string_list_clear(&branches, 1); - return i; + return result; } static void show_list(const char *title, struct string_list *list, -- cgit v1.2.3 From 441adf0ccf571a9fe15658fdfcd856d2aabc01cb Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Wed, 4 Feb 2009 11:06:07 -0500 Subject: builtin-remote: make rm operation safer in mirrored repository "git remote rm " happily removes non-remote refs and their reflogs. This may be okay if the repository truely is a mirror, but if the user had done "git remote add --mirror " 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 refs. The user is advised on how remove branches using "git branch -d", which itself has nice safety checks wrt to branch removal lacking from "git remote rm". Non-remote non-branch refs are skipped silently. Signed-off-by: Jay Soffian Acked-by: Jeff King Signed-off-by: Junio C Hamano --- builtin-remote.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'builtin-remote.c') diff --git a/builtin-remote.c b/builtin-remote.c index 9ccc8a90e9..07cfdac464 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -296,7 +296,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; }; @@ -321,6 +321,16 @@ static int add_branch_for_removal(const char *refname, return 0; } + /* don't delete non-remote refs */ + if (prefixcmp(refname, "refs/remotes")) { + /* advise user how to delete local branches */ + if (!prefixcmp(refname, "refs/heads/")) + string_list_append(abbrev_branch(refname), + branches->skipped); + /* silently skip over other non-remote refs */ + return 0; + } + /* make sure that symrefs are deleted */ if (flags & REF_ISSYMREF) return unlink(git_path("%s", refname)); @@ -355,7 +365,10 @@ static int rm(int argc, const char **argv) struct strbuf buf; 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) @@ -404,6 +417,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; } -- cgit v1.2.3