]>
Commit | Line | Data |
---|---|---|
c31820c2 LH |
1 | /* |
2 | * Builtin "git branch" | |
3 | * | |
d972cce0 | 4 | * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com> |
c31820c2 LH |
5 | * Based on git-branch.sh by Junio C Hamano. |
6 | */ | |
7 | ||
8 | #include "cache.h" | |
85023577 | 9 | #include "color.h" |
c31820c2 LH |
10 | #include "refs.h" |
11 | #include "commit.h" | |
12 | #include "builtin.h" | |
6f084a56 | 13 | #include "remote.h" |
a8dfd5ea | 14 | #include "parse-options.h" |
e496c003 | 15 | #include "branch.h" |
68067ca1 JH |
16 | #include "diff.h" |
17 | #include "revision.h" | |
a8dfd5ea PH |
18 | |
19 | static const char * const builtin_branch_usage[] = { | |
1b1dd23f SB |
20 | "git branch [options] [-r | -a] [--merged | --no-merged]", |
21 | "git branch [options] [-l] [-f] <branchname> [<start-point>]", | |
22 | "git branch [options] [-r] (-d | -D) <branchname>", | |
23 | "git branch [options] (-m | -M) [<oldbranch>] <newbranch>", | |
a8dfd5ea PH |
24 | NULL |
25 | }; | |
c31820c2 | 26 | |
f3d985c3 JH |
27 | #define REF_LOCAL_BRANCH 0x01 |
28 | #define REF_REMOTE_BRANCH 0x02 | |
c31820c2 LH |
29 | |
30 | static const char *head; | |
31 | static unsigned char head_sha1[20]; | |
32 | ||
6b2f2d98 | 33 | static int branch_use_color = -1; |
a1158cae | 34 | static char branch_colors[][COLOR_MAXLEN] = { |
dc6ebd4c AL |
35 | GIT_COLOR_RESET, |
36 | GIT_COLOR_NORMAL, /* PLAIN */ | |
37 | GIT_COLOR_RED, /* REMOTE */ | |
38 | GIT_COLOR_NORMAL, /* LOCAL */ | |
39 | GIT_COLOR_GREEN, /* CURRENT */ | |
a1158cae AP |
40 | }; |
41 | enum color_branch { | |
74bb2dfb AL |
42 | BRANCH_COLOR_RESET = 0, |
43 | BRANCH_COLOR_PLAIN = 1, | |
44 | BRANCH_COLOR_REMOTE = 2, | |
45 | BRANCH_COLOR_LOCAL = 3, | |
46 | BRANCH_COLOR_CURRENT = 4, | |
a1158cae AP |
47 | }; |
48 | ||
049716b3 JH |
49 | static enum merge_filter { |
50 | NO_FILTER = 0, | |
51 | SHOW_NOT_MERGED, | |
52 | SHOW_MERGED, | |
53 | } merge_filter; | |
54 | static unsigned char merge_filter_ref[20]; | |
e8b404c2 | 55 | |
a1158cae AP |
56 | static int parse_branch_color_slot(const char *var, int ofs) |
57 | { | |
58 | if (!strcasecmp(var+ofs, "plain")) | |
74bb2dfb | 59 | return BRANCH_COLOR_PLAIN; |
a1158cae | 60 | if (!strcasecmp(var+ofs, "reset")) |
74bb2dfb | 61 | return BRANCH_COLOR_RESET; |
a1158cae | 62 | if (!strcasecmp(var+ofs, "remote")) |
74bb2dfb | 63 | return BRANCH_COLOR_REMOTE; |
a1158cae | 64 | if (!strcasecmp(var+ofs, "local")) |
74bb2dfb | 65 | return BRANCH_COLOR_LOCAL; |
a1158cae | 66 | if (!strcasecmp(var+ofs, "current")) |
74bb2dfb | 67 | return BRANCH_COLOR_CURRENT; |
8b8e8624 | 68 | return -1; |
a1158cae AP |
69 | } |
70 | ||
ef90d6d4 | 71 | static int git_branch_config(const char *var, const char *value, void *cb) |
a1158cae AP |
72 | { |
73 | if (!strcmp(var, "color.branch")) { | |
0f6f5a40 | 74 | branch_use_color = git_config_colorbool(var, value, -1); |
a1158cae AP |
75 | return 0; |
76 | } | |
cc44c765 | 77 | if (!prefixcmp(var, "color.branch.")) { |
a1158cae | 78 | int slot = parse_branch_color_slot(var, 13); |
8b8e8624 JK |
79 | if (slot < 0) |
80 | return 0; | |
5768c98a JH |
81 | if (!value) |
82 | return config_error_nonbool(var); | |
a1158cae AP |
83 | color_parse(value, var, branch_colors[slot]); |
84 | return 0; | |
85 | } | |
ef90d6d4 | 86 | return git_color_default_config(var, value, cb); |
a1158cae AP |
87 | } |
88 | ||
52fae7de | 89 | static const char *branch_get_color(enum color_branch ix) |
a1158cae | 90 | { |
6b2f2d98 | 91 | if (branch_use_color > 0) |
a1158cae AP |
92 | return branch_colors[ix]; |
93 | return ""; | |
94 | } | |
95 | ||
99c419c9 JH |
96 | static int branch_merged(int kind, const char *name, |
97 | struct commit *rev, struct commit *head_rev) | |
98 | { | |
99 | /* | |
100 | * This checks whether the merge bases of branch and HEAD (or | |
101 | * the other branch this branch builds upon) contains the | |
102 | * branch, which means that the branch has already been merged | |
103 | * safely to HEAD (or the other branch). | |
104 | */ | |
105 | struct commit *reference_rev = NULL; | |
106 | const char *reference_name = NULL; | |
107 | int merged; | |
108 | ||
109 | if (kind == REF_LOCAL_BRANCH) { | |
110 | struct branch *branch = branch_get(name); | |
111 | unsigned char sha1[20]; | |
112 | ||
113 | if (branch && | |
114 | branch->merge && | |
115 | branch->merge[0] && | |
116 | branch->merge[0]->dst && | |
117 | (reference_name = | |
118 | resolve_ref(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) | |
119 | reference_rev = lookup_commit_reference(sha1); | |
120 | } | |
121 | if (!reference_rev) | |
122 | reference_rev = head_rev; | |
123 | ||
124 | merged = in_merge_bases(rev, &reference_rev, 1); | |
125 | ||
126 | /* | |
127 | * After the safety valve is fully redefined to "check with | |
128 | * upstream, if any, otherwise with HEAD", we should just | |
129 | * return the result of the in_merge_bases() above without | |
130 | * any of the following code, but during the transition period, | |
131 | * a gentle reminder is in order. | |
132 | */ | |
133 | if ((head_rev != reference_rev) && | |
134 | in_merge_bases(rev, &head_rev, 1) != merged) { | |
135 | if (merged) | |
136 | warning("deleting branch '%s' that has been merged to\n" | |
137 | " '%s', but it is not yet merged to HEAD.", | |
138 | name, reference_name); | |
139 | else | |
140 | warning("not deleting branch '%s' that is not yet merged to\n" | |
141 | " '%s', even though it is merged to HEAD.", | |
142 | name, reference_name); | |
143 | } | |
144 | return merged; | |
145 | } | |
146 | ||
b8e9a00d | 147 | static int delete_branches(int argc, const char **argv, int force, int kinds) |
c31820c2 | 148 | { |
99c419c9 | 149 | struct commit *rev, *head_rev = NULL; |
c31820c2 | 150 | unsigned char sha1[20]; |
b8e9a00d | 151 | char *name = NULL; |
f3d985c3 | 152 | const char *fmt, *remote; |
c31820c2 | 153 | int i; |
b8e9a00d | 154 | int ret = 0; |
8415d5c7 | 155 | struct strbuf bname = STRBUF_INIT; |
c31820c2 | 156 | |
f3d985c3 JH |
157 | switch (kinds) { |
158 | case REF_REMOTE_BRANCH: | |
159 | fmt = "refs/remotes/%s"; | |
160 | remote = "remote "; | |
161 | force = 1; | |
162 | break; | |
163 | case REF_LOCAL_BRANCH: | |
164 | fmt = "refs/heads/%s"; | |
165 | remote = ""; | |
166 | break; | |
167 | default: | |
168 | die("cannot use -a with -d"); | |
169 | } | |
c31820c2 | 170 | |
67affd51 JH |
171 | if (!force) { |
172 | head_rev = lookup_commit_reference(head_sha1); | |
173 | if (!head_rev) | |
174 | die("Couldn't look up commit object for HEAD"); | |
175 | } | |
8415d5c7 | 176 | for (i = 0; i < argc; i++, strbuf_release(&bname)) { |
a552de75 | 177 | strbuf_branchname(&bname, argv[i]); |
8415d5c7 | 178 | if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) { |
b8e9a00d | 179 | error("Cannot delete the branch '%s' " |
8415d5c7 | 180 | "which you are currently on.", bname.buf); |
b8e9a00d QT |
181 | ret = 1; |
182 | continue; | |
183 | } | |
184 | ||
8e0f7003 | 185 | free(name); |
c31820c2 | 186 | |
8415d5c7 | 187 | name = xstrdup(mkpath(fmt, bname.buf)); |
b8e9a00d QT |
188 | if (!resolve_ref(name, sha1, 1, NULL)) { |
189 | error("%sbranch '%s' not found.", | |
8415d5c7 | 190 | remote, bname.buf); |
b8e9a00d QT |
191 | ret = 1; |
192 | continue; | |
193 | } | |
c31820c2 LH |
194 | |
195 | rev = lookup_commit_reference(sha1); | |
b8e9a00d QT |
196 | if (!rev) { |
197 | error("Couldn't look up commit object for '%s'", name); | |
198 | ret = 1; | |
199 | continue; | |
200 | } | |
c31820c2 | 201 | |
99c419c9 JH |
202 | if (!force && !branch_merged(kinds, bname.buf, rev, head_rev)) { |
203 | error("The branch '%s' is not fully merged.\n" | |
8415d5c7 JH |
204 | "If you are sure you want to delete it, " |
205 | "run 'git branch -D %s'.", bname.buf, bname.buf); | |
b8e9a00d QT |
206 | ret = 1; |
207 | continue; | |
c31820c2 LH |
208 | } |
209 | ||
eca35a25 | 210 | if (delete_ref(name, sha1, 0)) { |
b8e9a00d | 211 | error("Error deleting %sbranch '%s'", remote, |
8415d5c7 | 212 | bname.buf); |
b8e9a00d | 213 | ret = 1; |
f1eccbab | 214 | } else { |
3c59c50d | 215 | struct strbuf buf = STRBUF_INIT; |
23fd723c | 216 | printf("Deleted %sbranch %s (was %s).\n", remote, |
8415d5c7 JH |
217 | bname.buf, |
218 | find_unique_abbrev(sha1, DEFAULT_ABBREV)); | |
219 | strbuf_addf(&buf, "branch.%s", bname.buf); | |
3c59c50d | 220 | if (git_config_rename_section(buf.buf, NULL) < 0) |
f1eccbab | 221 | warning("Update of config-file failed"); |
3c59c50d | 222 | strbuf_release(&buf); |
f1eccbab | 223 | } |
c31820c2 | 224 | } |
c31820c2 | 225 | |
8e0f7003 | 226 | free(name); |
b8e9a00d QT |
227 | |
228 | return(ret); | |
c31820c2 | 229 | } |
c31820c2 | 230 | |
bfcc9214 AP |
231 | struct ref_item { |
232 | char *name; | |
209d336a JS |
233 | char *dest; |
234 | unsigned int kind, len; | |
68067ca1 | 235 | struct commit *commit; |
bfcc9214 AP |
236 | }; |
237 | ||
238 | struct ref_list { | |
68067ca1 | 239 | struct rev_info revs; |
7e9ff00b | 240 | int index, alloc, maxwidth, verbose, abbrev; |
bfcc9214 | 241 | struct ref_item *list; |
694a5775 | 242 | struct commit_list *with_commit; |
bfcc9214 AP |
243 | int kinds; |
244 | }; | |
245 | ||
209d336a JS |
246 | static char *resolve_symref(const char *src, const char *prefix) |
247 | { | |
248 | unsigned char sha1[20]; | |
249 | int flag; | |
250 | const char *dst, *cp; | |
251 | ||
252 | dst = resolve_ref(src, sha1, 0, &flag); | |
253 | if (!(dst && (flag & REF_ISSYMREF))) | |
254 | return NULL; | |
255 | if (prefix && (cp = skip_prefix(dst, prefix))) | |
256 | dst = cp; | |
257 | return xstrdup(dst); | |
258 | } | |
259 | ||
bfcc9214 | 260 | static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) |
c31820c2 | 261 | { |
bfcc9214 AP |
262 | struct ref_list *ref_list = (struct ref_list*)(cb_data); |
263 | struct ref_item *newitem; | |
68067ca1 | 264 | struct commit *commit; |
209d336a JS |
265 | int kind, i; |
266 | const char *prefix, *orig_refname = refname; | |
267 | ||
268 | static struct { | |
269 | int kind; | |
270 | const char *prefix; | |
271 | int pfxlen; | |
272 | } ref_kind[] = { | |
273 | { REF_LOCAL_BRANCH, "refs/heads/", 11 }, | |
274 | { REF_REMOTE_BRANCH, "refs/remotes/", 13 }, | |
275 | }; | |
bfcc9214 AP |
276 | |
277 | /* Detect kind */ | |
209d336a JS |
278 | for (i = 0; i < ARRAY_SIZE(ref_kind); i++) { |
279 | prefix = ref_kind[i].prefix; | |
280 | if (strncmp(refname, prefix, ref_kind[i].pfxlen)) | |
281 | continue; | |
282 | kind = ref_kind[i].kind; | |
283 | refname += ref_kind[i].pfxlen; | |
284 | break; | |
285 | } | |
286 | if (ARRAY_SIZE(ref_kind) <= i) | |
0f31d680 | 287 | return 0; |
bfcc9214 AP |
288 | |
289 | /* Don't add types the caller doesn't want */ | |
290 | if ((kind & ref_list->kinds) == 0) | |
291 | return 0; | |
292 | ||
191d1ac4 LT |
293 | commit = NULL; |
294 | if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { | |
295 | commit = lookup_commit_reference_gently(sha1, 1); | |
296 | if (!commit) | |
297 | return error("branch '%s' does not point at a commit", refname); | |
68067ca1 | 298 | |
191d1ac4 LT |
299 | /* Filter with with_commit if specified */ |
300 | if (!is_descendant_of(commit, ref_list->with_commit)) | |
301 | return 0; | |
694a5775 | 302 | |
191d1ac4 LT |
303 | if (merge_filter != NO_FILTER) |
304 | add_pending_object(&ref_list->revs, | |
305 | (struct object *)commit, refname); | |
306 | } | |
e8b404c2 | 307 | |
bfcc9214 AP |
308 | /* Resize buffer */ |
309 | if (ref_list->index >= ref_list->alloc) { | |
310 | ref_list->alloc = alloc_nr(ref_list->alloc); | |
311 | ref_list->list = xrealloc(ref_list->list, | |
312 | ref_list->alloc * sizeof(struct ref_item)); | |
c31820c2 LH |
313 | } |
314 | ||
bfcc9214 AP |
315 | /* Record the new item */ |
316 | newitem = &(ref_list->list[ref_list->index++]); | |
317 | newitem->name = xstrdup(refname); | |
318 | newitem->kind = kind; | |
68067ca1 | 319 | newitem->commit = commit; |
209d336a JS |
320 | newitem->len = strlen(refname); |
321 | newitem->dest = resolve_symref(orig_refname, prefix); | |
322 | /* adjust for "remotes/" */ | |
323 | if (newitem->kind == REF_REMOTE_BRANCH && | |
324 | ref_list->kinds != REF_REMOTE_BRANCH) | |
325 | newitem->len += 8; | |
326 | if (newitem->len > ref_list->maxwidth) | |
327 | ref_list->maxwidth = newitem->len; | |
c31820c2 LH |
328 | |
329 | return 0; | |
330 | } | |
331 | ||
bfcc9214 AP |
332 | static void free_ref_list(struct ref_list *ref_list) |
333 | { | |
334 | int i; | |
335 | ||
209d336a | 336 | for (i = 0; i < ref_list->index; i++) { |
bfcc9214 | 337 | free(ref_list->list[i].name); |
209d336a JS |
338 | free(ref_list->list[i].dest); |
339 | } | |
bfcc9214 AP |
340 | free(ref_list->list); |
341 | } | |
342 | ||
c31820c2 LH |
343 | static int ref_cmp(const void *r1, const void *r2) |
344 | { | |
bfcc9214 AP |
345 | struct ref_item *c1 = (struct ref_item *)(r1); |
346 | struct ref_item *c2 = (struct ref_item *)(r2); | |
347 | ||
348 | if (c1->kind != c2->kind) | |
349 | return c1->kind - c2->kind; | |
350 | return strcmp(c1->name, c2->name); | |
c31820c2 LH |
351 | } |
352 | ||
2d8a7f0b JK |
353 | static void fill_tracking_info(struct strbuf *stat, const char *branch_name, |
354 | int show_upstream_ref) | |
94fcb730 JH |
355 | { |
356 | int ours, theirs; | |
357 | struct branch *branch = branch_get(branch_name); | |
358 | ||
2d8a7f0b JK |
359 | if (!stat_tracking_info(branch, &ours, &theirs)) { |
360 | if (branch && branch->merge && branch->merge[0]->dst && | |
361 | show_upstream_ref) | |
362 | strbuf_addf(stat, "[%s] ", | |
6e7b3309 | 363 | shorten_unambiguous_ref(branch->merge[0]->dst, 0)); |
94fcb730 | 364 | return; |
2d8a7f0b JK |
365 | } |
366 | ||
367 | strbuf_addch(stat, '['); | |
368 | if (show_upstream_ref) | |
369 | strbuf_addf(stat, "%s: ", | |
6e7b3309 | 370 | shorten_unambiguous_ref(branch->merge[0]->dst, 0)); |
94fcb730 | 371 | if (!ours) |
2d8a7f0b | 372 | strbuf_addf(stat, "behind %d] ", theirs); |
94fcb730 | 373 | else if (!theirs) |
2d8a7f0b | 374 | strbuf_addf(stat, "ahead %d] ", ours); |
94fcb730 | 375 | else |
2d8a7f0b | 376 | strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs); |
94fcb730 JH |
377 | } |
378 | ||
7950cda7 LH |
379 | static int matches_merge_filter(struct commit *commit) |
380 | { | |
381 | int is_merged; | |
382 | ||
383 | if (merge_filter == NO_FILTER) | |
384 | return 1; | |
385 | ||
386 | is_merged = !!(commit->object.flags & UNINTERESTING); | |
387 | return (is_merged == (merge_filter == SHOW_MERGED)); | |
388 | } | |
389 | ||
af0e4ac0 | 390 | static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, |
209d336a | 391 | int abbrev, int current, char *prefix) |
75e6e213 | 392 | { |
af0e4ac0 LH |
393 | char c; |
394 | int color; | |
68067ca1 | 395 | struct commit *commit = item->commit; |
209d336a | 396 | struct strbuf out = STRBUF_INIT, name = STRBUF_INIT; |
68067ca1 | 397 | |
7950cda7 LH |
398 | if (!matches_merge_filter(commit)) |
399 | return; | |
75e6e213 | 400 | |
af0e4ac0 LH |
401 | switch (item->kind) { |
402 | case REF_LOCAL_BRANCH: | |
74bb2dfb | 403 | color = BRANCH_COLOR_LOCAL; |
af0e4ac0 LH |
404 | break; |
405 | case REF_REMOTE_BRANCH: | |
74bb2dfb | 406 | color = BRANCH_COLOR_REMOTE; |
af0e4ac0 LH |
407 | break; |
408 | default: | |
74bb2dfb | 409 | color = BRANCH_COLOR_PLAIN; |
af0e4ac0 LH |
410 | break; |
411 | } | |
75e6e213 | 412 | |
af0e4ac0 LH |
413 | c = ' '; |
414 | if (current) { | |
415 | c = '*'; | |
74bb2dfb | 416 | color = BRANCH_COLOR_CURRENT; |
af0e4ac0 | 417 | } |
75e6e213 | 418 | |
209d336a JS |
419 | strbuf_addf(&name, "%s%s", prefix, item->name); |
420 | if (verbose) | |
421 | strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color), | |
422 | maxwidth, name.buf, | |
81474267 | 423 | branch_get_color(BRANCH_COLOR_RESET)); |
209d336a JS |
424 | else |
425 | strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color), | |
81474267 | 426 | name.buf, branch_get_color(BRANCH_COLOR_RESET)); |
209d336a JS |
427 | |
428 | if (item->dest) | |
429 | strbuf_addf(&out, " -> %s", item->dest); | |
430 | else if (verbose) { | |
d3f9f9a9 | 431 | struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; |
80583c0e | 432 | const char *sub = " **** invalid ref ****"; |
674d1727 | 433 | |
68067ca1 | 434 | commit = item->commit; |
80583c0e | 435 | if (commit && !parse_commit(commit)) { |
dd2e794a | 436 | struct pretty_print_context ctx = {0}; |
674d1727 | 437 | pretty_print_commit(CMIT_FMT_ONELINE, commit, |
dd2e794a | 438 | &subject, &ctx); |
674d1727 | 439 | sub = subject.buf; |
80583c0e | 440 | } |
94fcb730 JH |
441 | |
442 | if (item->kind == REF_LOCAL_BRANCH) | |
2d8a7f0b | 443 | fill_tracking_info(&stat, item->name, verbose > 1); |
94fcb730 | 444 | |
209d336a JS |
445 | strbuf_addf(&out, " %s %s%s", |
446 | find_unique_abbrev(item->commit->object.sha1, abbrev), | |
447 | stat.buf, sub); | |
d3f9f9a9 | 448 | strbuf_release(&stat); |
674d1727 | 449 | strbuf_release(&subject); |
af0e4ac0 | 450 | } |
209d336a JS |
451 | printf("%s\n", out.buf); |
452 | strbuf_release(&name); | |
453 | strbuf_release(&out); | |
75e6e213 LH |
454 | } |
455 | ||
b6f637d1 LH |
456 | static int calc_maxwidth(struct ref_list *refs) |
457 | { | |
209d336a | 458 | int i, w = 0; |
b6f637d1 LH |
459 | for (i = 0; i < refs->index; i++) { |
460 | if (!matches_merge_filter(refs->list[i].commit)) | |
461 | continue; | |
209d336a JS |
462 | if (refs->list[i].len > w) |
463 | w = refs->list[i].len; | |
b6f637d1 LH |
464 | } |
465 | return w; | |
466 | } | |
467 | ||
7e9ff00b LT |
468 | |
469 | static void show_detached(struct ref_list *ref_list) | |
470 | { | |
471 | struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1); | |
472 | ||
473 | if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) { | |
474 | struct ref_item item; | |
475 | item.name = xstrdup("(no branch)"); | |
476 | item.len = strlen(item.name); | |
477 | item.kind = REF_LOCAL_BRANCH; | |
478 | item.dest = NULL; | |
479 | item.commit = head_commit; | |
480 | if (item.len > ref_list->maxwidth) | |
481 | ref_list->maxwidth = item.len; | |
482 | print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, ""); | |
483 | free(item.name); | |
484 | } | |
485 | } | |
486 | ||
694a5775 | 487 | static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit) |
c31820c2 LH |
488 | { |
489 | int i; | |
bfcc9214 | 490 | struct ref_list ref_list; |
c31820c2 | 491 | |
bfcc9214 AP |
492 | memset(&ref_list, 0, sizeof(ref_list)); |
493 | ref_list.kinds = kinds; | |
191d1ac4 | 494 | ref_list.verbose = verbose; |
7e9ff00b | 495 | ref_list.abbrev = abbrev; |
694a5775 | 496 | ref_list.with_commit = with_commit; |
68067ca1 JH |
497 | if (merge_filter != NO_FILTER) |
498 | init_revisions(&ref_list.revs, NULL); | |
e6e4a47b | 499 | for_each_rawref(append_ref, &ref_list); |
68067ca1 JH |
500 | if (merge_filter != NO_FILTER) { |
501 | struct commit *filter; | |
502 | filter = lookup_commit_reference_gently(merge_filter_ref, 0); | |
503 | filter->object.flags |= UNINTERESTING; | |
504 | add_pending_object(&ref_list.revs, | |
505 | (struct object *) filter, ""); | |
506 | ref_list.revs.limited = 1; | |
507 | prepare_revision_walk(&ref_list.revs); | |
b6f637d1 LH |
508 | if (verbose) |
509 | ref_list.maxwidth = calc_maxwidth(&ref_list); | |
68067ca1 | 510 | } |
c31820c2 | 511 | |
bfcc9214 | 512 | qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); |
c31820c2 | 513 | |
0016a482 | 514 | detached = (detached && (kinds & REF_LOCAL_BRANCH)); |
7e9ff00b LT |
515 | if (detached) |
516 | show_detached(&ref_list); | |
0016a482 | 517 | |
bfcc9214 | 518 | for (i = 0; i < ref_list.index; i++) { |
0016a482 LH |
519 | int current = !detached && |
520 | (ref_list.list[i].kind == REF_LOCAL_BRANCH) && | |
af0e4ac0 | 521 | !strcmp(ref_list.list[i].name, head); |
209d336a JS |
522 | char *prefix = (kinds != REF_REMOTE_BRANCH && |
523 | ref_list.list[i].kind == REF_REMOTE_BRANCH) | |
524 | ? "remotes/" : ""; | |
af0e4ac0 | 525 | print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose, |
209d336a | 526 | abbrev, current, prefix); |
c31820c2 | 527 | } |
bfcc9214 AP |
528 | |
529 | free_ref_list(&ref_list); | |
c31820c2 LH |
530 | } |
531 | ||
c976d415 LH |
532 | static void rename_branch(const char *oldname, const char *newname, int force) |
533 | { | |
da3f78a2 | 534 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
c976d415 | 535 | unsigned char sha1[20]; |
da3f78a2 | 536 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
cbdffe40 | 537 | int recovery = 0; |
c976d415 | 538 | |
c847f537 | 539 | if (!oldname) |
3dff5379 | 540 | die("cannot rename the current branch while not on any."); |
c847f537 | 541 | |
cbdffe40 JH |
542 | if (strbuf_check_branch_ref(&oldref, oldname)) { |
543 | /* | |
544 | * Bad name --- this could be an attempt to rename a | |
545 | * ref that we used to allow to be created by accident. | |
546 | */ | |
547 | if (resolve_ref(oldref.buf, sha1, 1, NULL)) | |
548 | recovery = 1; | |
549 | else | |
550 | die("Invalid branch name: '%s'", oldname); | |
551 | } | |
c976d415 | 552 | |
a2fab531 | 553 | if (strbuf_check_branch_ref(&newref, newname)) |
03d3aada | 554 | die("Invalid branch name: '%s'", newname); |
c976d415 | 555 | |
da3f78a2 | 556 | if (resolve_ref(newref.buf, sha1, 1, NULL) && !force) |
03d3aada | 557 | die("A branch named '%s' already exists.", newref.buf + 11); |
c976d415 | 558 | |
da3f78a2 MV |
559 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", |
560 | oldref.buf, newref.buf); | |
678d0f4c | 561 | |
da3f78a2 | 562 | if (rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
c976d415 | 563 | die("Branch rename failed"); |
da3f78a2 | 564 | strbuf_release(&logmsg); |
c976d415 | 565 | |
cbdffe40 JH |
566 | if (recovery) |
567 | warning("Renamed a misnamed branch '%s' away", oldref.buf + 11); | |
568 | ||
8b5157e4 | 569 | /* no need to pass logmsg here as HEAD didn't really move */ |
da3f78a2 | 570 | if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) |
c976d415 | 571 | die("Branch renamed to %s, but HEAD is not updated!", newname); |
19eba151 | 572 | |
da3f78a2 MV |
573 | strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); |
574 | strbuf_release(&oldref); | |
575 | strbuf_addf(&newsection, "branch.%s", newref.buf + 11); | |
576 | strbuf_release(&newref); | |
577 | if (git_config_rename_section(oldsection.buf, newsection.buf) < 0) | |
19eba151 | 578 | die("Branch is renamed, but update of config-file failed"); |
da3f78a2 MV |
579 | strbuf_release(&oldsection); |
580 | strbuf_release(&newsection); | |
c976d415 LH |
581 | } |
582 | ||
049716b3 JH |
583 | static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset) |
584 | { | |
585 | merge_filter = ((opt->long_name[0] == 'n') | |
586 | ? SHOW_NOT_MERGED | |
587 | : SHOW_MERGED); | |
588 | if (unset) | |
589 | merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */ | |
590 | if (!arg) | |
591 | arg = "HEAD"; | |
592 | if (get_sha1(arg, merge_filter_ref)) | |
593 | die("malformed object name %s", arg); | |
594 | return 0; | |
595 | } | |
596 | ||
c31820c2 LH |
597 | int cmd_branch(int argc, const char **argv, const char *prefix) |
598 | { | |
d11d44fa | 599 | int delete = 0, rename = 0, force_create = 0; |
0016a482 | 600 | int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0; |
9ed36cfa JS |
601 | int reflog = 0; |
602 | enum branch_track track; | |
d11d44fa | 603 | int kinds = REF_LOCAL_BRANCH; |
694a5775 | 604 | struct commit_list *with_commit = NULL; |
a8dfd5ea PH |
605 | |
606 | struct option options[] = { | |
607 | OPT_GROUP("Generic options"), | |
608 | OPT__VERBOSE(&verbose), | |
be427d75 | 609 | OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))", |
9ed36cfa | 610 | BRANCH_TRACK_EXPLICIT), |
4fc50066 IL |
611 | OPT_SET_INT( 0, "set-upstream", &track, "change upstream info", |
612 | BRANCH_TRACK_OVERRIDE), | |
a8dfd5ea | 613 | OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"), |
d11d44fa PH |
614 | OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches", |
615 | REF_REMOTE_BRANCH), | |
e84fb2ff JH |
616 | { |
617 | OPTION_CALLBACK, 0, "contains", &with_commit, "commit", | |
618 | "print only branches that contain the commit", | |
619 | PARSE_OPT_LASTARG_DEFAULT, | |
269defdf | 620 | parse_opt_with_commit, (intptr_t)"HEAD", |
e84fb2ff | 621 | }, |
694a5775 JH |
622 | { |
623 | OPTION_CALLBACK, 0, "with", &with_commit, "commit", | |
624 | "print only branches that contain the commit", | |
e84fb2ff | 625 | PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, |
269defdf | 626 | parse_opt_with_commit, (intptr_t) "HEAD", |
694a5775 | 627 | }, |
a8dfd5ea PH |
628 | OPT__ABBREV(&abbrev), |
629 | ||
630 | OPT_GROUP("Specific git-branch actions:"), | |
d11d44fa PH |
631 | OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches", |
632 | REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), | |
633 | OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1), | |
634 | OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2), | |
635 | OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1), | |
636 | OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2), | |
637 | OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"), | |
f7aec129 | 638 | OPT_BOOLEAN('f', "force", &force_create, "force creation (when already exists)"), |
049716b3 JH |
639 | { |
640 | OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, | |
641 | "commit", "print only not merged branches", | |
642 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
643 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
644 | }, | |
645 | { | |
646 | OPTION_CALLBACK, 0, "merged", &merge_filter_ref, | |
647 | "commit", "print only merged branches", | |
648 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
649 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
650 | }, | |
a8dfd5ea PH |
651 | OPT_END(), |
652 | }; | |
c31820c2 | 653 | |
ef90d6d4 | 654 | git_config(git_branch_config, NULL); |
6b2f2d98 MK |
655 | |
656 | if (branch_use_color == -1) | |
657 | branch_use_color = git_use_color_default; | |
658 | ||
9ed36cfa | 659 | track = git_branch_track; |
c976d415 | 660 | |
078f8380 | 661 | head = resolve_ref("HEAD", head_sha1, 0, NULL); |
c31820c2 LH |
662 | if (!head) |
663 | die("Failed to resolve HEAD as a valid ref."); | |
078f8380 | 664 | head = xstrdup(head); |
0016a482 LH |
665 | if (!strcmp(head, "HEAD")) { |
666 | detached = 1; | |
a8dfd5ea | 667 | } else { |
cc44c765 | 668 | if (prefixcmp(head, "refs/heads/")) |
0016a482 LH |
669 | die("HEAD not found below refs/heads!"); |
670 | head += 11; | |
671 | } | |
049716b3 JH |
672 | hashcpy(merge_filter_ref, head_sha1); |
673 | ||
37782920 SB |
674 | argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, |
675 | 0); | |
049716b3 JH |
676 | if (!!delete + !!rename + !!force_create > 1) |
677 | usage_with_options(builtin_branch_usage, options); | |
c31820c2 LH |
678 | |
679 | if (delete) | |
d11d44fa | 680 | return delete_branches(argc, argv, delete > 1, kinds); |
a8dfd5ea | 681 | else if (argc == 0) |
694a5775 | 682 | print_ref_list(kinds, detached, verbose, abbrev, with_commit); |
a8dfd5ea | 683 | else if (rename && (argc == 1)) |
d11d44fa | 684 | rename_branch(head, argv[0], rename > 1); |
a8dfd5ea | 685 | else if (rename && (argc == 2)) |
d11d44fa | 686 | rename_branch(argv[0], argv[1], rename > 1); |
6e8f993a MM |
687 | else if (argc <= 2) { |
688 | if (kinds != REF_LOCAL_BRANCH) | |
689 | die("-a and -r options to 'git branch' do not make sense with a branch name"); | |
e496c003 | 690 | create_branch(head, argv[0], (argc == 2) ? argv[1] : head, |
45994a1e | 691 | force_create, reflog, track); |
6e8f993a | 692 | } else |
a8dfd5ea | 693 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
694 | |
695 | return 0; | |
696 | } |