@matheusbsbs / matheus-bagliano / commits / f3d985c380
Fork 0

Teach git-branch to delete tracking branches with -r -d

Because -r already means "remote" when listing, you can say: $ git branch -d -r origin/todo origin/html origin/man I just twisted it not to check fast-forwardness with the current branch when you are removing a tracking branch. Most likely, removal of a tracking branch is not because you are "done with" it (for a local branch, it usually means "you merged it up"), but because you are not even interested in it. In other words, remote tracking branches are more like tags than branches. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Dec 17, 2006 at 23:58 UTC f3d985c38090b77e46dcc00d42574b9ba49bdc22
1 file changed +28 -13
builtin-branch.c
+28 -13
@@ -12,8 +12,12 @@
12 #include "builtin.h"
13
14 static const char builtin_branch_usage[] =
15 - "git-branch (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [-r | -a] [-v [--abbrev=<length>]]";
15 + "git-branch [-r] (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [-r | -a] [-v [--abbrev=<length>]]";
16
17 +#define REF_UNKNOWN_TYPE 0x00
18 +#define REF_LOCAL_BRANCH 0x01
19 +#define REF_REMOTE_BRANCH 0x02
20 +#define REF_TAG 0x04
21
22 static const char *head;
23 static unsigned char head_sha1[20];
@@ -89,25 +93,40 @@ static int in_merge_bases(const unsigned char *sha1,
93 return ret;
94 }
95
92 -static void delete_branches(int argc, const char **argv, int force)
96 +static void delete_branches(int argc, const char **argv, int force, int kinds)
97 {
98 struct commit *rev, *head_rev = head_rev;
99 unsigned char sha1[20];
100 char *name;
101 + const char *fmt, *remote;
102 int i;
103
104 + switch (kinds) {
105 + case REF_REMOTE_BRANCH:
106 + fmt = "refs/remotes/%s";
107 + remote = "remote ";
108 + force = 1;
109 + break;
110 + case REF_LOCAL_BRANCH:
111 + fmt = "refs/heads/%s";
112 + remote = "";
113 + break;
114 + default:
115 + die("cannot use -a with -d");
116 + }
117 +
118 if (!force) {
119 head_rev = lookup_commit_reference(head_sha1);
120 if (!head_rev)
121 die("Couldn't look up commit object for HEAD");
122 }
123 for (i = 0; i < argc; i++) {
105 - if (!strcmp(head, argv[i]))
124 + if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i]))
125 die("Cannot delete the branch you are currently on.");
126
108 - name = xstrdup(mkpath("refs/heads/%s", argv[i]));
127 + name = xstrdup(mkpath(fmt, argv[i]));
128 if (!resolve_ref(name, sha1, 1, NULL))
110 - die("Branch '%s' not found.", argv[i]);
129 + die("%sbranch '%s' not found.", remote, argv[i]);
130
131 rev = lookup_commit_reference(sha1);
132 if (!rev)
@@ -128,19 +147,15 @@ static void delete_branches(int argc, const char **argv, int force)
147 }
148
149 if (delete_ref(name, sha1))
131 - printf("Error deleting branch '%s'\n", argv[i]);
150 + printf("Error deleting %sbranch '%s'\n", remote,
151 + argv[i]);
152 else
133 - printf("Deleted branch %s.\n", argv[i]);
153 + printf("Deleted %sbranch %s.\n", remote, argv[i]);
154
155 free(name);
156 }
157 }
158
139 -#define REF_UNKNOWN_TYPE 0x00
140 -#define REF_LOCAL_BRANCH 0x01
141 -#define REF_REMOTE_BRANCH 0x02
142 -#define REF_TAG 0x04
143 -
159 struct ref_item {
160 char *name;
161 unsigned int kind;
@@ -435,7 +450,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
450 head += 11;
451
452 if (delete)
438 - delete_branches(argc - i, argv + i, force_delete);
453 + delete_branches(argc - i, argv + i, force_delete, kinds);
454 else if (i == argc)
455 print_ref_list(kinds, verbose, abbrev);
456 else if (rename && (i == argc - 1))