]>
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>]", | |
534cea3f | 22 | "git branch [options] [-r] (-d | -D) <branchname>...", |
1b1dd23f | 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, | |
4b05548f | 46 | BRANCH_COLOR_CURRENT = 4 |
a1158cae AP |
47 | }; |
48 | ||
049716b3 JH |
49 | static enum merge_filter { |
50 | NO_FILTER = 0, | |
51 | SHOW_NOT_MERGED, | |
4b05548f | 52 | SHOW_MERGED |
049716b3 JH |
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")) { | |
e269eb79 | 74 | branch_use_color = git_config_colorbool(var, value); |
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 | { |
daa0c3d9 | 91 | if (want_color(branch_use_color)) |
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; | |
96ec7b1e | 107 | void *reference_name_to_free = NULL; |
99c419c9 JH |
108 | int merged; |
109 | ||
110 | if (kind == REF_LOCAL_BRANCH) { | |
111 | struct branch *branch = branch_get(name); | |
112 | unsigned char sha1[20]; | |
113 | ||
114 | if (branch && | |
115 | branch->merge && | |
116 | branch->merge[0] && | |
117 | branch->merge[0]->dst && | |
96ec7b1e NTND |
118 | (reference_name = reference_name_to_free = |
119 | resolve_refdup(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) | |
99c419c9 JH |
120 | reference_rev = lookup_commit_reference(sha1); |
121 | } | |
122 | if (!reference_rev) | |
123 | reference_rev = head_rev; | |
124 | ||
125 | merged = in_merge_bases(rev, &reference_rev, 1); | |
126 | ||
127 | /* | |
128 | * After the safety valve is fully redefined to "check with | |
129 | * upstream, if any, otherwise with HEAD", we should just | |
130 | * return the result of the in_merge_bases() above without | |
131 | * any of the following code, but during the transition period, | |
132 | * a gentle reminder is in order. | |
133 | */ | |
134 | if ((head_rev != reference_rev) && | |
135 | in_merge_bases(rev, &head_rev, 1) != merged) { | |
136 | if (merged) | |
49df4b02 | 137 | warning(_("deleting branch '%s' that has been merged to\n" |
6c80cd29 | 138 | " '%s', but not yet merged to HEAD."), |
99c419c9 JH |
139 | name, reference_name); |
140 | else | |
49df4b02 ÆAB |
141 | warning(_("not deleting branch '%s' that is not yet merged to\n" |
142 | " '%s', even though it is merged to HEAD."), | |
99c419c9 JH |
143 | name, reference_name); |
144 | } | |
96ec7b1e | 145 | free(reference_name_to_free); |
99c419c9 JH |
146 | return merged; |
147 | } | |
148 | ||
d65ddf19 JK |
149 | static int delete_branches(int argc, const char **argv, int force, int kinds, |
150 | int quiet) | |
c31820c2 | 151 | { |
99c419c9 | 152 | struct commit *rev, *head_rev = NULL; |
c31820c2 | 153 | unsigned char sha1[20]; |
b8e9a00d | 154 | char *name = NULL; |
f3d985c3 | 155 | const char *fmt, *remote; |
c31820c2 | 156 | int i; |
b8e9a00d | 157 | int ret = 0; |
8415d5c7 | 158 | struct strbuf bname = STRBUF_INIT; |
c31820c2 | 159 | |
f3d985c3 JH |
160 | switch (kinds) { |
161 | case REF_REMOTE_BRANCH: | |
162 | fmt = "refs/remotes/%s"; | |
2852e1dd ÆAB |
163 | /* TRANSLATORS: This is "remote " in "remote branch '%s' not found" */ |
164 | remote = _("remote "); | |
f3d985c3 JH |
165 | force = 1; |
166 | break; | |
167 | case REF_LOCAL_BRANCH: | |
168 | fmt = "refs/heads/%s"; | |
169 | remote = ""; | |
170 | break; | |
171 | default: | |
49df4b02 | 172 | die(_("cannot use -a with -d")); |
f3d985c3 | 173 | } |
c31820c2 | 174 | |
67affd51 JH |
175 | if (!force) { |
176 | head_rev = lookup_commit_reference(head_sha1); | |
177 | if (!head_rev) | |
49df4b02 | 178 | die(_("Couldn't look up commit object for HEAD")); |
67affd51 | 179 | } |
8415d5c7 | 180 | for (i = 0; i < argc; i++, strbuf_release(&bname)) { |
a552de75 | 181 | strbuf_branchname(&bname, argv[i]); |
8415d5c7 | 182 | if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) { |
49df4b02 ÆAB |
183 | error(_("Cannot delete the branch '%s' " |
184 | "which you are currently on."), bname.buf); | |
b8e9a00d QT |
185 | ret = 1; |
186 | continue; | |
187 | } | |
188 | ||
8e0f7003 | 189 | free(name); |
c31820c2 | 190 | |
8415d5c7 | 191 | name = xstrdup(mkpath(fmt, bname.buf)); |
c6893323 | 192 | if (read_ref(name, sha1)) { |
49df4b02 | 193 | error(_("%sbranch '%s' not found."), |
8415d5c7 | 194 | remote, bname.buf); |
b8e9a00d QT |
195 | ret = 1; |
196 | continue; | |
197 | } | |
c31820c2 LH |
198 | |
199 | rev = lookup_commit_reference(sha1); | |
b8e9a00d | 200 | if (!rev) { |
49df4b02 | 201 | error(_("Couldn't look up commit object for '%s'"), name); |
b8e9a00d QT |
202 | ret = 1; |
203 | continue; | |
204 | } | |
c31820c2 | 205 | |
99c419c9 | 206 | if (!force && !branch_merged(kinds, bname.buf, rev, head_rev)) { |
49df4b02 | 207 | error(_("The branch '%s' is not fully merged.\n" |
8415d5c7 | 208 | "If you are sure you want to delete it, " |
49df4b02 | 209 | "run 'git branch -D %s'."), bname.buf, bname.buf); |
b8e9a00d QT |
210 | ret = 1; |
211 | continue; | |
c31820c2 LH |
212 | } |
213 | ||
eca35a25 | 214 | if (delete_ref(name, sha1, 0)) { |
49df4b02 | 215 | error(_("Error deleting %sbranch '%s'"), remote, |
8415d5c7 | 216 | bname.buf); |
b8e9a00d | 217 | ret = 1; |
f1eccbab | 218 | } else { |
3c59c50d | 219 | struct strbuf buf = STRBUF_INIT; |
d65ddf19 JK |
220 | if (!quiet) |
221 | printf(_("Deleted %sbranch %s (was %s).\n"), | |
222 | remote, bname.buf, | |
223 | find_unique_abbrev(sha1, DEFAULT_ABBREV)); | |
8415d5c7 | 224 | strbuf_addf(&buf, "branch.%s", bname.buf); |
3c59c50d | 225 | if (git_config_rename_section(buf.buf, NULL) < 0) |
49df4b02 | 226 | warning(_("Update of config-file failed")); |
3c59c50d | 227 | strbuf_release(&buf); |
f1eccbab | 228 | } |
c31820c2 | 229 | } |
c31820c2 | 230 | |
8e0f7003 | 231 | free(name); |
b8e9a00d QT |
232 | |
233 | return(ret); | |
c31820c2 | 234 | } |
c31820c2 | 235 | |
bfcc9214 AP |
236 | struct ref_item { |
237 | char *name; | |
209d336a JS |
238 | char *dest; |
239 | unsigned int kind, len; | |
68067ca1 | 240 | struct commit *commit; |
bfcc9214 AP |
241 | }; |
242 | ||
243 | struct ref_list { | |
68067ca1 | 244 | struct rev_info revs; |
7e9ff00b | 245 | int index, alloc, maxwidth, verbose, abbrev; |
bfcc9214 | 246 | struct ref_item *list; |
694a5775 | 247 | struct commit_list *with_commit; |
bfcc9214 AP |
248 | int kinds; |
249 | }; | |
250 | ||
209d336a JS |
251 | static char *resolve_symref(const char *src, const char *prefix) |
252 | { | |
253 | unsigned char sha1[20]; | |
254 | int flag; | |
255 | const char *dst, *cp; | |
256 | ||
8cad4744 | 257 | dst = resolve_ref_unsafe(src, sha1, 0, &flag); |
209d336a JS |
258 | if (!(dst && (flag & REF_ISSYMREF))) |
259 | return NULL; | |
260 | if (prefix && (cp = skip_prefix(dst, prefix))) | |
261 | dst = cp; | |
262 | return xstrdup(dst); | |
263 | } | |
264 | ||
1603ade8 SM |
265 | struct append_ref_cb { |
266 | struct ref_list *ref_list; | |
d8d33736 | 267 | const char **pattern; |
1603ade8 SM |
268 | int ret; |
269 | }; | |
270 | ||
d8d33736 MG |
271 | static int match_patterns(const char **pattern, const char *refname) |
272 | { | |
273 | if (!*pattern) | |
274 | return 1; /* no pattern always matches */ | |
275 | while (*pattern) { | |
276 | if (!fnmatch(*pattern, refname, 0)) | |
277 | return 1; | |
278 | pattern++; | |
279 | } | |
280 | return 0; | |
281 | } | |
282 | ||
bfcc9214 | 283 | static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) |
c31820c2 | 284 | { |
1603ade8 SM |
285 | struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data); |
286 | struct ref_list *ref_list = cb->ref_list; | |
bfcc9214 | 287 | struct ref_item *newitem; |
68067ca1 | 288 | struct commit *commit; |
209d336a JS |
289 | int kind, i; |
290 | const char *prefix, *orig_refname = refname; | |
291 | ||
292 | static struct { | |
293 | int kind; | |
294 | const char *prefix; | |
295 | int pfxlen; | |
296 | } ref_kind[] = { | |
297 | { REF_LOCAL_BRANCH, "refs/heads/", 11 }, | |
298 | { REF_REMOTE_BRANCH, "refs/remotes/", 13 }, | |
299 | }; | |
bfcc9214 AP |
300 | |
301 | /* Detect kind */ | |
209d336a JS |
302 | for (i = 0; i < ARRAY_SIZE(ref_kind); i++) { |
303 | prefix = ref_kind[i].prefix; | |
304 | if (strncmp(refname, prefix, ref_kind[i].pfxlen)) | |
305 | continue; | |
306 | kind = ref_kind[i].kind; | |
307 | refname += ref_kind[i].pfxlen; | |
308 | break; | |
309 | } | |
310 | if (ARRAY_SIZE(ref_kind) <= i) | |
0f31d680 | 311 | return 0; |
bfcc9214 AP |
312 | |
313 | /* Don't add types the caller doesn't want */ | |
314 | if ((kind & ref_list->kinds) == 0) | |
315 | return 0; | |
316 | ||
d8d33736 MG |
317 | if (!match_patterns(cb->pattern, refname)) |
318 | return 0; | |
319 | ||
191d1ac4 LT |
320 | commit = NULL; |
321 | if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { | |
322 | commit = lookup_commit_reference_gently(sha1, 1); | |
1603ade8 | 323 | if (!commit) { |
49df4b02 | 324 | cb->ret = error(_("branch '%s' does not point at a commit"), refname); |
0e9716e6 | 325 | return 0; |
1603ade8 | 326 | } |
68067ca1 | 327 | |
191d1ac4 LT |
328 | /* Filter with with_commit if specified */ |
329 | if (!is_descendant_of(commit, ref_list->with_commit)) | |
330 | return 0; | |
694a5775 | 331 | |
191d1ac4 LT |
332 | if (merge_filter != NO_FILTER) |
333 | add_pending_object(&ref_list->revs, | |
334 | (struct object *)commit, refname); | |
335 | } | |
e8b404c2 | 336 | |
fcbc0d8e | 337 | ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc); |
c31820c2 | 338 | |
bfcc9214 AP |
339 | /* Record the new item */ |
340 | newitem = &(ref_list->list[ref_list->index++]); | |
341 | newitem->name = xstrdup(refname); | |
342 | newitem->kind = kind; | |
68067ca1 | 343 | newitem->commit = commit; |
209d336a JS |
344 | newitem->len = strlen(refname); |
345 | newitem->dest = resolve_symref(orig_refname, prefix); | |
346 | /* adjust for "remotes/" */ | |
347 | if (newitem->kind == REF_REMOTE_BRANCH && | |
348 | ref_list->kinds != REF_REMOTE_BRANCH) | |
349 | newitem->len += 8; | |
350 | if (newitem->len > ref_list->maxwidth) | |
351 | ref_list->maxwidth = newitem->len; | |
c31820c2 LH |
352 | |
353 | return 0; | |
354 | } | |
355 | ||
bfcc9214 AP |
356 | static void free_ref_list(struct ref_list *ref_list) |
357 | { | |
358 | int i; | |
359 | ||
209d336a | 360 | for (i = 0; i < ref_list->index; i++) { |
bfcc9214 | 361 | free(ref_list->list[i].name); |
209d336a JS |
362 | free(ref_list->list[i].dest); |
363 | } | |
bfcc9214 AP |
364 | free(ref_list->list); |
365 | } | |
366 | ||
c31820c2 LH |
367 | static int ref_cmp(const void *r1, const void *r2) |
368 | { | |
bfcc9214 AP |
369 | struct ref_item *c1 = (struct ref_item *)(r1); |
370 | struct ref_item *c2 = (struct ref_item *)(r2); | |
371 | ||
372 | if (c1->kind != c2->kind) | |
373 | return c1->kind - c2->kind; | |
374 | return strcmp(c1->name, c2->name); | |
c31820c2 LH |
375 | } |
376 | ||
2d8a7f0b JK |
377 | static void fill_tracking_info(struct strbuf *stat, const char *branch_name, |
378 | int show_upstream_ref) | |
94fcb730 JH |
379 | { |
380 | int ours, theirs; | |
381 | struct branch *branch = branch_get(branch_name); | |
382 | ||
2d8a7f0b JK |
383 | if (!stat_tracking_info(branch, &ours, &theirs)) { |
384 | if (branch && branch->merge && branch->merge[0]->dst && | |
385 | show_upstream_ref) | |
386 | strbuf_addf(stat, "[%s] ", | |
6e7b3309 | 387 | shorten_unambiguous_ref(branch->merge[0]->dst, 0)); |
94fcb730 | 388 | return; |
2d8a7f0b JK |
389 | } |
390 | ||
391 | strbuf_addch(stat, '['); | |
392 | if (show_upstream_ref) | |
393 | strbuf_addf(stat, "%s: ", | |
6e7b3309 | 394 | shorten_unambiguous_ref(branch->merge[0]->dst, 0)); |
94fcb730 | 395 | if (!ours) |
a5760906 | 396 | strbuf_addf(stat, _("behind %d] "), theirs); |
94fcb730 | 397 | else if (!theirs) |
a5760906 | 398 | strbuf_addf(stat, _("ahead %d] "), ours); |
94fcb730 | 399 | else |
a5760906 | 400 | strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs); |
94fcb730 JH |
401 | } |
402 | ||
7950cda7 LH |
403 | static int matches_merge_filter(struct commit *commit) |
404 | { | |
405 | int is_merged; | |
406 | ||
407 | if (merge_filter == NO_FILTER) | |
408 | return 1; | |
409 | ||
410 | is_merged = !!(commit->object.flags & UNINTERESTING); | |
411 | return (is_merged == (merge_filter == SHOW_MERGED)); | |
412 | } | |
413 | ||
6e0332ec JN |
414 | static void add_verbose_info(struct strbuf *out, struct ref_item *item, |
415 | int verbose, int abbrev) | |
416 | { | |
417 | struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; | |
418 | const char *sub = " **** invalid ref ****"; | |
419 | struct commit *commit = item->commit; | |
420 | ||
421 | if (commit && !parse_commit(commit)) { | |
f67d2e82 | 422 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject); |
6e0332ec JN |
423 | sub = subject.buf; |
424 | } | |
425 | ||
426 | if (item->kind == REF_LOCAL_BRANCH) | |
427 | fill_tracking_info(&stat, item->name, verbose > 1); | |
428 | ||
429 | strbuf_addf(out, " %s %s%s", | |
430 | find_unique_abbrev(item->commit->object.sha1, abbrev), | |
431 | stat.buf, sub); | |
432 | strbuf_release(&stat); | |
433 | strbuf_release(&subject); | |
434 | } | |
435 | ||
af0e4ac0 | 436 | static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, |
209d336a | 437 | int abbrev, int current, char *prefix) |
75e6e213 | 438 | { |
af0e4ac0 LH |
439 | char c; |
440 | int color; | |
68067ca1 | 441 | struct commit *commit = item->commit; |
209d336a | 442 | struct strbuf out = STRBUF_INIT, name = STRBUF_INIT; |
68067ca1 | 443 | |
7950cda7 LH |
444 | if (!matches_merge_filter(commit)) |
445 | return; | |
75e6e213 | 446 | |
af0e4ac0 LH |
447 | switch (item->kind) { |
448 | case REF_LOCAL_BRANCH: | |
74bb2dfb | 449 | color = BRANCH_COLOR_LOCAL; |
af0e4ac0 LH |
450 | break; |
451 | case REF_REMOTE_BRANCH: | |
74bb2dfb | 452 | color = BRANCH_COLOR_REMOTE; |
af0e4ac0 LH |
453 | break; |
454 | default: | |
74bb2dfb | 455 | color = BRANCH_COLOR_PLAIN; |
af0e4ac0 LH |
456 | break; |
457 | } | |
75e6e213 | 458 | |
af0e4ac0 LH |
459 | c = ' '; |
460 | if (current) { | |
461 | c = '*'; | |
74bb2dfb | 462 | color = BRANCH_COLOR_CURRENT; |
af0e4ac0 | 463 | } |
75e6e213 | 464 | |
209d336a JS |
465 | strbuf_addf(&name, "%s%s", prefix, item->name); |
466 | if (verbose) | |
467 | strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color), | |
468 | maxwidth, name.buf, | |
81474267 | 469 | branch_get_color(BRANCH_COLOR_RESET)); |
209d336a JS |
470 | else |
471 | strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color), | |
81474267 | 472 | name.buf, branch_get_color(BRANCH_COLOR_RESET)); |
209d336a JS |
473 | |
474 | if (item->dest) | |
475 | strbuf_addf(&out, " -> %s", item->dest); | |
6e0332ec JN |
476 | else if (verbose) |
477 | /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */ | |
478 | add_verbose_info(&out, item, verbose, abbrev); | |
209d336a JS |
479 | printf("%s\n", out.buf); |
480 | strbuf_release(&name); | |
481 | strbuf_release(&out); | |
75e6e213 LH |
482 | } |
483 | ||
b6f637d1 LH |
484 | static int calc_maxwidth(struct ref_list *refs) |
485 | { | |
209d336a | 486 | int i, w = 0; |
b6f637d1 LH |
487 | for (i = 0; i < refs->index; i++) { |
488 | if (!matches_merge_filter(refs->list[i].commit)) | |
489 | continue; | |
209d336a JS |
490 | if (refs->list[i].len > w) |
491 | w = refs->list[i].len; | |
b6f637d1 LH |
492 | } |
493 | return w; | |
494 | } | |
495 | ||
7e9ff00b LT |
496 | |
497 | static void show_detached(struct ref_list *ref_list) | |
498 | { | |
499 | struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1); | |
500 | ||
501 | if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) { | |
502 | struct ref_item item; | |
409fa556 | 503 | item.name = xstrdup(_("(no branch)")); |
7e9ff00b LT |
504 | item.len = strlen(item.name); |
505 | item.kind = REF_LOCAL_BRANCH; | |
506 | item.dest = NULL; | |
507 | item.commit = head_commit; | |
508 | if (item.len > ref_list->maxwidth) | |
509 | ref_list->maxwidth = item.len; | |
510 | print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, ""); | |
511 | free(item.name); | |
512 | } | |
513 | } | |
514 | ||
d8d33736 | 515 | static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern) |
c31820c2 LH |
516 | { |
517 | int i; | |
1603ade8 | 518 | struct append_ref_cb cb; |
bfcc9214 | 519 | struct ref_list ref_list; |
c31820c2 | 520 | |
bfcc9214 AP |
521 | memset(&ref_list, 0, sizeof(ref_list)); |
522 | ref_list.kinds = kinds; | |
191d1ac4 | 523 | ref_list.verbose = verbose; |
7e9ff00b | 524 | ref_list.abbrev = abbrev; |
694a5775 | 525 | ref_list.with_commit = with_commit; |
68067ca1 JH |
526 | if (merge_filter != NO_FILTER) |
527 | init_revisions(&ref_list.revs, NULL); | |
1603ade8 | 528 | cb.ref_list = &ref_list; |
d8d33736 | 529 | cb.pattern = pattern; |
1603ade8 SM |
530 | cb.ret = 0; |
531 | for_each_rawref(append_ref, &cb); | |
68067ca1 JH |
532 | if (merge_filter != NO_FILTER) { |
533 | struct commit *filter; | |
534 | filter = lookup_commit_reference_gently(merge_filter_ref, 0); | |
6c41e975 CMN |
535 | if (!filter) |
536 | die("object '%s' does not point to a commit", | |
537 | sha1_to_hex(merge_filter_ref)); | |
538 | ||
68067ca1 JH |
539 | filter->object.flags |= UNINTERESTING; |
540 | add_pending_object(&ref_list.revs, | |
541 | (struct object *) filter, ""); | |
542 | ref_list.revs.limited = 1; | |
543 | prepare_revision_walk(&ref_list.revs); | |
b6f637d1 LH |
544 | if (verbose) |
545 | ref_list.maxwidth = calc_maxwidth(&ref_list); | |
68067ca1 | 546 | } |
c31820c2 | 547 | |
bfcc9214 | 548 | qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); |
c31820c2 | 549 | |
0016a482 | 550 | detached = (detached && (kinds & REF_LOCAL_BRANCH)); |
d8d33736 | 551 | if (detached && match_patterns(pattern, "HEAD")) |
7e9ff00b | 552 | show_detached(&ref_list); |
0016a482 | 553 | |
bfcc9214 | 554 | for (i = 0; i < ref_list.index; i++) { |
0016a482 LH |
555 | int current = !detached && |
556 | (ref_list.list[i].kind == REF_LOCAL_BRANCH) && | |
af0e4ac0 | 557 | !strcmp(ref_list.list[i].name, head); |
209d336a JS |
558 | char *prefix = (kinds != REF_REMOTE_BRANCH && |
559 | ref_list.list[i].kind == REF_REMOTE_BRANCH) | |
560 | ? "remotes/" : ""; | |
af0e4ac0 | 561 | print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose, |
209d336a | 562 | abbrev, current, prefix); |
c31820c2 | 563 | } |
bfcc9214 AP |
564 | |
565 | free_ref_list(&ref_list); | |
1603ade8 | 566 | |
0e9716e6 | 567 | if (cb.ret) |
49df4b02 | 568 | error(_("some refs could not be read")); |
0e9716e6 | 569 | |
1603ade8 | 570 | return cb.ret; |
c31820c2 LH |
571 | } |
572 | ||
c976d415 LH |
573 | static void rename_branch(const char *oldname, const char *newname, int force) |
574 | { | |
da3f78a2 | 575 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
da3f78a2 | 576 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
cbdffe40 | 577 | int recovery = 0; |
3f59481e | 578 | int clobber_head_ok; |
c976d415 | 579 | |
c847f537 | 580 | if (!oldname) |
49df4b02 | 581 | die(_("cannot rename the current branch while not on any.")); |
c847f537 | 582 | |
cbdffe40 JH |
583 | if (strbuf_check_branch_ref(&oldref, oldname)) { |
584 | /* | |
585 | * Bad name --- this could be an attempt to rename a | |
586 | * ref that we used to allow to be created by accident. | |
587 | */ | |
c6893323 | 588 | if (ref_exists(oldref.buf)) |
cbdffe40 JH |
589 | recovery = 1; |
590 | else | |
49df4b02 | 591 | die(_("Invalid branch name: '%s'"), oldname); |
cbdffe40 | 592 | } |
c976d415 | 593 | |
3f59481e JN |
594 | /* |
595 | * A command like "git branch -M currentbranch currentbranch" cannot | |
596 | * cause the worktree to become inconsistent with HEAD, so allow it. | |
597 | */ | |
598 | clobber_head_ok = !strcmp(oldname, newname); | |
599 | ||
600 | validate_new_branchname(newname, &newref, force, clobber_head_ok); | |
c976d415 | 601 | |
da3f78a2 MV |
602 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", |
603 | oldref.buf, newref.buf); | |
678d0f4c | 604 | |
da3f78a2 | 605 | if (rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
49df4b02 | 606 | die(_("Branch rename failed")); |
da3f78a2 | 607 | strbuf_release(&logmsg); |
c976d415 | 608 | |
cbdffe40 | 609 | if (recovery) |
49df4b02 | 610 | warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11); |
cbdffe40 | 611 | |
8b5157e4 | 612 | /* no need to pass logmsg here as HEAD didn't really move */ |
da3f78a2 | 613 | if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) |
49df4b02 | 614 | die(_("Branch renamed to %s, but HEAD is not updated!"), newname); |
19eba151 | 615 | |
da3f78a2 MV |
616 | strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); |
617 | strbuf_release(&oldref); | |
618 | strbuf_addf(&newsection, "branch.%s", newref.buf + 11); | |
619 | strbuf_release(&newref); | |
620 | if (git_config_rename_section(oldsection.buf, newsection.buf) < 0) | |
49df4b02 | 621 | die(_("Branch is renamed, but update of config-file failed")); |
da3f78a2 MV |
622 | strbuf_release(&oldsection); |
623 | strbuf_release(&newsection); | |
c976d415 LH |
624 | } |
625 | ||
049716b3 JH |
626 | static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset) |
627 | { | |
628 | merge_filter = ((opt->long_name[0] == 'n') | |
629 | ? SHOW_NOT_MERGED | |
630 | : SHOW_MERGED); | |
631 | if (unset) | |
632 | merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */ | |
633 | if (!arg) | |
634 | arg = "HEAD"; | |
635 | if (get_sha1(arg, merge_filter_ref)) | |
49df4b02 | 636 | die(_("malformed object name %s"), arg); |
049716b3 JH |
637 | return 0; |
638 | } | |
639 | ||
b7200e83 JH |
640 | static const char edit_description[] = "BRANCH_DESCRIPTION"; |
641 | ||
642 | static int edit_branch_description(const char *branch_name) | |
643 | { | |
644 | FILE *fp; | |
645 | int status; | |
646 | struct strbuf buf = STRBUF_INIT; | |
647 | struct strbuf name = STRBUF_INIT; | |
648 | ||
649 | read_branch_desc(&buf, branch_name); | |
650 | if (!buf.len || buf.buf[buf.len-1] != '\n') | |
651 | strbuf_addch(&buf, '\n'); | |
652 | strbuf_addf(&buf, | |
653 | "# Please edit the description for the branch\n" | |
654 | "# %s\n" | |
655 | "# Lines starting with '#' will be stripped.\n", | |
656 | branch_name); | |
657 | fp = fopen(git_path(edit_description), "w"); | |
658 | if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) { | |
659 | strbuf_release(&buf); | |
660 | return error(_("could not write branch description template: %s\n"), | |
661 | strerror(errno)); | |
662 | } | |
663 | strbuf_reset(&buf); | |
664 | if (launch_editor(git_path(edit_description), &buf, NULL)) { | |
665 | strbuf_release(&buf); | |
666 | return -1; | |
667 | } | |
668 | stripspace(&buf, 1); | |
669 | ||
670 | strbuf_addf(&name, "branch.%s.description", branch_name); | |
671 | status = git_config_set(name.buf, buf.buf); | |
672 | strbuf_release(&name); | |
673 | strbuf_release(&buf); | |
674 | ||
675 | return status; | |
676 | } | |
677 | ||
c31820c2 LH |
678 | int cmd_branch(int argc, const char **argv, const char *prefix) |
679 | { | |
cddd127b | 680 | int delete = 0, rename = 0, force_create = 0, list = 0; |
b792c067 | 681 | int verbose = 0, abbrev = -1, detached = 0; |
b7200e83 | 682 | int reflog = 0, edit_description = 0; |
d65ddf19 | 683 | int quiet = 0; |
9ed36cfa | 684 | enum branch_track track; |
d11d44fa | 685 | int kinds = REF_LOCAL_BRANCH; |
694a5775 | 686 | struct commit_list *with_commit = NULL; |
a8dfd5ea PH |
687 | |
688 | struct option options[] = { | |
689 | OPT_GROUP("Generic options"), | |
39271425 RS |
690 | OPT__VERBOSE(&verbose, |
691 | "show hash and subject, give twice for upstream branch"), | |
d65ddf19 | 692 | OPT__QUIET(&quiet, "suppress informational messages"), |
be427d75 | 693 | OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))", |
9ed36cfa | 694 | BRANCH_TRACK_EXPLICIT), |
4fc50066 IL |
695 | OPT_SET_INT( 0, "set-upstream", &track, "change upstream info", |
696 | BRANCH_TRACK_OVERRIDE), | |
73e9da01 | 697 | OPT__COLOR(&branch_use_color, "use colored output"), |
171edcbb | 698 | OPT_SET_INT('r', "remotes", &kinds, "act on remote-tracking branches", |
d11d44fa | 699 | REF_REMOTE_BRANCH), |
e84fb2ff JH |
700 | { |
701 | OPTION_CALLBACK, 0, "contains", &with_commit, "commit", | |
702 | "print only branches that contain the commit", | |
703 | PARSE_OPT_LASTARG_DEFAULT, | |
269defdf | 704 | parse_opt_with_commit, (intptr_t)"HEAD", |
e84fb2ff | 705 | }, |
694a5775 JH |
706 | { |
707 | OPTION_CALLBACK, 0, "with", &with_commit, "commit", | |
708 | "print only branches that contain the commit", | |
e84fb2ff | 709 | PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, |
269defdf | 710 | parse_opt_with_commit, (intptr_t) "HEAD", |
694a5775 | 711 | }, |
a8dfd5ea PH |
712 | OPT__ABBREV(&abbrev), |
713 | ||
714 | OPT_GROUP("Specific git-branch actions:"), | |
171edcbb | 715 | OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches", |
d11d44fa | 716 | REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), |
171edcbb | 717 | OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1), |
d11d44fa | 718 | OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2), |
171edcbb | 719 | OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1), |
d11d44fa | 720 | OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2), |
cddd127b | 721 | OPT_BOOLEAN(0, "list", &list, "list branch names"), |
171edcbb | 722 | OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"), |
b7200e83 JH |
723 | OPT_BOOLEAN(0, "edit-description", &edit_description, |
724 | "edit the description for the branch"), | |
76946b76 | 725 | OPT__FORCE(&force_create, "force creation (when already exists)"), |
049716b3 JH |
726 | { |
727 | OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, | |
728 | "commit", "print only not merged branches", | |
729 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
730 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
731 | }, | |
732 | { | |
733 | OPTION_CALLBACK, 0, "merged", &merge_filter_ref, | |
734 | "commit", "print only merged branches", | |
735 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
736 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
737 | }, | |
a8dfd5ea PH |
738 | OPT_END(), |
739 | }; | |
c31820c2 | 740 | |
1dacfbcf NTND |
741 | if (argc == 2 && !strcmp(argv[1], "-h")) |
742 | usage_with_options(builtin_branch_usage, options); | |
743 | ||
ef90d6d4 | 744 | git_config(git_branch_config, NULL); |
6b2f2d98 | 745 | |
9ed36cfa | 746 | track = git_branch_track; |
c976d415 | 747 | |
96ec7b1e | 748 | head = resolve_refdup("HEAD", head_sha1, 0, NULL); |
c31820c2 | 749 | if (!head) |
49df4b02 | 750 | die(_("Failed to resolve HEAD as a valid ref.")); |
0016a482 LH |
751 | if (!strcmp(head, "HEAD")) { |
752 | detached = 1; | |
a8dfd5ea | 753 | } else { |
cc44c765 | 754 | if (prefixcmp(head, "refs/heads/")) |
49df4b02 | 755 | die(_("HEAD not found below refs/heads!")); |
0016a482 LH |
756 | head += 11; |
757 | } | |
049716b3 JH |
758 | hashcpy(merge_filter_ref, head_sha1); |
759 | ||
37782920 SB |
760 | argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, |
761 | 0); | |
cddd127b | 762 | |
a4043aea | 763 | if (!delete && !rename && !edit_description && argc == 0) |
cddd127b MG |
764 | list = 1; |
765 | ||
766 | if (!!delete + !!rename + !!force_create + !!list > 1) | |
049716b3 | 767 | usage_with_options(builtin_branch_usage, options); |
c31820c2 | 768 | |
b792c067 NK |
769 | if (abbrev == -1) |
770 | abbrev = DEFAULT_ABBREV; | |
771 | ||
c31820c2 | 772 | if (delete) |
d65ddf19 | 773 | return delete_branches(argc, argv, delete > 1, kinds, quiet); |
cddd127b | 774 | else if (list) |
d8d33736 MG |
775 | return print_ref_list(kinds, detached, verbose, abbrev, |
776 | with_commit, argv); | |
b7200e83 JH |
777 | else if (edit_description) { |
778 | const char *branch_name; | |
c2d17ba3 JH |
779 | struct strbuf branch_ref = STRBUF_INIT; |
780 | ||
b7200e83 JH |
781 | if (detached) |
782 | die("Cannot give description to detached HEAD"); | |
783 | if (!argc) | |
784 | branch_name = head; | |
785 | else if (argc == 1) | |
786 | branch_name = argv[0]; | |
787 | else | |
788 | usage_with_options(builtin_branch_usage, options); | |
c2d17ba3 JH |
789 | |
790 | strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); | |
791 | if (!ref_exists(branch_ref.buf)) { | |
792 | strbuf_release(&branch_ref); | |
793 | ||
794 | if (!argc) | |
795 | return error("No commit on branch '%s' yet.", | |
796 | branch_name); | |
797 | else | |
798 | return error("No such branch '%s'.", branch_name); | |
799 | } | |
800 | strbuf_release(&branch_ref); | |
801 | ||
b7200e83 JH |
802 | if (edit_branch_description(branch_name)) |
803 | return 1; | |
a4043aea | 804 | } else if (rename) { |
3706ed29 TRC |
805 | if (argc == 1) |
806 | rename_branch(head, argv[0], rename > 1); | |
807 | else if (argc == 2) | |
808 | rename_branch(argv[0], argv[1], rename > 1); | |
809 | else | |
810 | usage_with_options(builtin_branch_usage, options); | |
5cd75c7d | 811 | } else if (argc > 0 && argc <= 2) { |
6e8f993a | 812 | if (kinds != REF_LOCAL_BRANCH) |
49df4b02 | 813 | die(_("-a and -r options to 'git branch' do not make sense with a branch name")); |
e496c003 | 814 | create_branch(head, argv[0], (argc == 2) ? argv[1] : head, |
d65ddf19 | 815 | force_create, reflog, 0, quiet, track); |
6e8f993a | 816 | } else |
a8dfd5ea | 817 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
818 | |
819 | return 0; | |
820 | } |