]>
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 AP |
34 | static char branch_colors[][COLOR_MAXLEN] = { |
35 | "\033[m", /* reset */ | |
36 | "", /* PLAIN (normal) */ | |
37 | "\033[31m", /* REMOTE (red) */ | |
753f96a4 JH |
38 | "", /* LOCAL (normal) */ |
39 | "\033[32m", /* CURRENT (green) */ | |
a1158cae AP |
40 | }; |
41 | enum color_branch { | |
42 | COLOR_BRANCH_RESET = 0, | |
43 | COLOR_BRANCH_PLAIN = 1, | |
44 | COLOR_BRANCH_REMOTE = 2, | |
45 | COLOR_BRANCH_LOCAL = 3, | |
46 | COLOR_BRANCH_CURRENT = 4, | |
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")) | |
59 | return COLOR_BRANCH_PLAIN; | |
60 | if (!strcasecmp(var+ofs, "reset")) | |
61 | return COLOR_BRANCH_RESET; | |
62 | if (!strcasecmp(var+ofs, "remote")) | |
63 | return COLOR_BRANCH_REMOTE; | |
64 | if (!strcasecmp(var+ofs, "local")) | |
65 | return COLOR_BRANCH_LOCAL; | |
66 | if (!strcasecmp(var+ofs, "current")) | |
67 | return COLOR_BRANCH_CURRENT; | |
68 | die("bad config variable '%s'", var); | |
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); |
5768c98a JH |
79 | if (!value) |
80 | return config_error_nonbool(var); | |
a1158cae AP |
81 | color_parse(value, var, branch_colors[slot]); |
82 | return 0; | |
83 | } | |
ef90d6d4 | 84 | return git_color_default_config(var, value, cb); |
a1158cae AP |
85 | } |
86 | ||
52fae7de | 87 | static const char *branch_get_color(enum color_branch ix) |
a1158cae | 88 | { |
6b2f2d98 | 89 | if (branch_use_color > 0) |
a1158cae AP |
90 | return branch_colors[ix]; |
91 | return ""; | |
92 | } | |
93 | ||
b8e9a00d | 94 | static int delete_branches(int argc, const char **argv, int force, int kinds) |
c31820c2 | 95 | { |
67affd51 | 96 | struct commit *rev, *head_rev = head_rev; |
c31820c2 | 97 | unsigned char sha1[20]; |
b8e9a00d | 98 | char *name = NULL; |
f3d985c3 | 99 | const char *fmt, *remote; |
c31820c2 | 100 | int i; |
b8e9a00d | 101 | int ret = 0; |
8415d5c7 | 102 | struct strbuf bname = STRBUF_INIT; |
c31820c2 | 103 | |
f3d985c3 JH |
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 | } | |
c31820c2 | 117 | |
67affd51 JH |
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 | } | |
8415d5c7 JH |
123 | for (i = 0; i < argc; i++, strbuf_release(&bname)) { |
124 | int len = strlen(argv[i]); | |
125 | ||
126 | if (interpret_nth_last_branch(argv[i], &bname) != len) | |
127 | strbuf_add(&bname, argv[i], len); | |
128 | ||
129 | if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) { | |
b8e9a00d | 130 | error("Cannot delete the branch '%s' " |
8415d5c7 | 131 | "which you are currently on.", bname.buf); |
b8e9a00d QT |
132 | ret = 1; |
133 | continue; | |
134 | } | |
135 | ||
8e0f7003 | 136 | free(name); |
c31820c2 | 137 | |
8415d5c7 | 138 | name = xstrdup(mkpath(fmt, bname.buf)); |
b8e9a00d QT |
139 | if (!resolve_ref(name, sha1, 1, NULL)) { |
140 | error("%sbranch '%s' not found.", | |
8415d5c7 | 141 | remote, bname.buf); |
b8e9a00d QT |
142 | ret = 1; |
143 | continue; | |
144 | } | |
c31820c2 LH |
145 | |
146 | rev = lookup_commit_reference(sha1); | |
b8e9a00d QT |
147 | if (!rev) { |
148 | error("Couldn't look up commit object for '%s'", name); | |
149 | ret = 1; | |
150 | continue; | |
151 | } | |
c31820c2 LH |
152 | |
153 | /* This checks whether the merge bases of branch and | |
154 | * HEAD contains branch -- which means that the HEAD | |
155 | * contains everything in both. | |
156 | */ | |
157 | ||
158 | if (!force && | |
03840fc3 | 159 | !in_merge_bases(rev, &head_rev, 1)) { |
00ae8289 | 160 | error("The branch '%s' is not an ancestor of " |
8415d5c7 JH |
161 | "your current HEAD.\n" |
162 | "If you are sure you want to delete it, " | |
163 | "run 'git branch -D %s'.", bname.buf, bname.buf); | |
b8e9a00d QT |
164 | ret = 1; |
165 | continue; | |
c31820c2 LH |
166 | } |
167 | ||
eca35a25 | 168 | if (delete_ref(name, sha1, 0)) { |
b8e9a00d | 169 | error("Error deleting %sbranch '%s'", remote, |
8415d5c7 | 170 | bname.buf); |
b8e9a00d | 171 | ret = 1; |
f1eccbab | 172 | } else { |
3c59c50d | 173 | struct strbuf buf = STRBUF_INIT; |
8afd3178 | 174 | printf("Deleted %sbranch %s (was %s).\n", remote, |
8415d5c7 JH |
175 | bname.buf, |
176 | find_unique_abbrev(sha1, DEFAULT_ABBREV)); | |
177 | strbuf_addf(&buf, "branch.%s", bname.buf); | |
3c59c50d | 178 | if (git_config_rename_section(buf.buf, NULL) < 0) |
f1eccbab | 179 | warning("Update of config-file failed"); |
3c59c50d | 180 | strbuf_release(&buf); |
f1eccbab | 181 | } |
c31820c2 | 182 | } |
c31820c2 | 183 | |
8e0f7003 | 184 | free(name); |
b8e9a00d QT |
185 | |
186 | return(ret); | |
c31820c2 | 187 | } |
c31820c2 | 188 | |
bfcc9214 AP |
189 | struct ref_item { |
190 | char *name; | |
191 | unsigned int kind; | |
68067ca1 | 192 | struct commit *commit; |
bfcc9214 AP |
193 | }; |
194 | ||
195 | struct ref_list { | |
68067ca1 | 196 | struct rev_info revs; |
75e6e213 | 197 | int index, alloc, maxwidth; |
bfcc9214 | 198 | struct ref_item *list; |
694a5775 | 199 | struct commit_list *with_commit; |
bfcc9214 AP |
200 | int kinds; |
201 | }; | |
202 | ||
203 | static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) | |
c31820c2 | 204 | { |
bfcc9214 AP |
205 | struct ref_list *ref_list = (struct ref_list*)(cb_data); |
206 | struct ref_item *newitem; | |
68067ca1 | 207 | struct commit *commit; |
0f31d680 | 208 | int kind; |
75e6e213 | 209 | int len; |
bfcc9214 AP |
210 | |
211 | /* Detect kind */ | |
cc44c765 | 212 | if (!prefixcmp(refname, "refs/heads/")) { |
bfcc9214 AP |
213 | kind = REF_LOCAL_BRANCH; |
214 | refname += 11; | |
cc44c765 | 215 | } else if (!prefixcmp(refname, "refs/remotes/")) { |
bfcc9214 AP |
216 | kind = REF_REMOTE_BRANCH; |
217 | refname += 13; | |
0f31d680 JH |
218 | } else |
219 | return 0; | |
bfcc9214 | 220 | |
68067ca1 JH |
221 | commit = lookup_commit_reference_gently(sha1, 1); |
222 | if (!commit) | |
223 | return error("branch '%s' does not point at a commit", refname); | |
224 | ||
694a5775 | 225 | /* Filter with with_commit if specified */ |
7fcdb36e | 226 | if (!is_descendant_of(commit, ref_list->with_commit)) |
694a5775 JH |
227 | return 0; |
228 | ||
bfcc9214 AP |
229 | /* Don't add types the caller doesn't want */ |
230 | if ((kind & ref_list->kinds) == 0) | |
231 | return 0; | |
232 | ||
346d437a | 233 | if (merge_filter != NO_FILTER) |
68067ca1 | 234 | add_pending_object(&ref_list->revs, |
346d437a | 235 | (struct object *)commit, refname); |
e8b404c2 | 236 | |
bfcc9214 AP |
237 | /* Resize buffer */ |
238 | if (ref_list->index >= ref_list->alloc) { | |
239 | ref_list->alloc = alloc_nr(ref_list->alloc); | |
240 | ref_list->list = xrealloc(ref_list->list, | |
241 | ref_list->alloc * sizeof(struct ref_item)); | |
c31820c2 LH |
242 | } |
243 | ||
bfcc9214 AP |
244 | /* Record the new item */ |
245 | newitem = &(ref_list->list[ref_list->index++]); | |
246 | newitem->name = xstrdup(refname); | |
247 | newitem->kind = kind; | |
68067ca1 | 248 | newitem->commit = commit; |
75e6e213 LH |
249 | len = strlen(newitem->name); |
250 | if (len > ref_list->maxwidth) | |
251 | ref_list->maxwidth = len; | |
c31820c2 LH |
252 | |
253 | return 0; | |
254 | } | |
255 | ||
bfcc9214 AP |
256 | static void free_ref_list(struct ref_list *ref_list) |
257 | { | |
258 | int i; | |
259 | ||
260 | for (i = 0; i < ref_list->index; i++) | |
261 | free(ref_list->list[i].name); | |
262 | free(ref_list->list); | |
263 | } | |
264 | ||
c31820c2 LH |
265 | static int ref_cmp(const void *r1, const void *r2) |
266 | { | |
bfcc9214 AP |
267 | struct ref_item *c1 = (struct ref_item *)(r1); |
268 | struct ref_item *c2 = (struct ref_item *)(r2); | |
269 | ||
270 | if (c1->kind != c2->kind) | |
271 | return c1->kind - c2->kind; | |
272 | return strcmp(c1->name, c2->name); | |
c31820c2 LH |
273 | } |
274 | ||
d3f9f9a9 | 275 | static void fill_tracking_info(struct strbuf *stat, const char *branch_name) |
94fcb730 JH |
276 | { |
277 | int ours, theirs; | |
278 | struct branch *branch = branch_get(branch_name); | |
279 | ||
926ab840 | 280 | if (!stat_tracking_info(branch, &ours, &theirs) || (!ours && !theirs)) |
94fcb730 | 281 | return; |
94fcb730 | 282 | if (!ours) |
d3f9f9a9 | 283 | strbuf_addf(stat, "[behind %d] ", theirs); |
94fcb730 | 284 | else if (!theirs) |
d3f9f9a9 | 285 | strbuf_addf(stat, "[ahead %d] ", ours); |
94fcb730 | 286 | else |
d3f9f9a9 | 287 | strbuf_addf(stat, "[ahead %d, behind %d] ", ours, theirs); |
94fcb730 JH |
288 | } |
289 | ||
7950cda7 LH |
290 | static int matches_merge_filter(struct commit *commit) |
291 | { | |
292 | int is_merged; | |
293 | ||
294 | if (merge_filter == NO_FILTER) | |
295 | return 1; | |
296 | ||
297 | is_merged = !!(commit->object.flags & UNINTERESTING); | |
298 | return (is_merged == (merge_filter == SHOW_MERGED)); | |
299 | } | |
300 | ||
af0e4ac0 LH |
301 | static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, |
302 | int abbrev, int current) | |
75e6e213 | 303 | { |
af0e4ac0 LH |
304 | char c; |
305 | int color; | |
68067ca1 JH |
306 | struct commit *commit = item->commit; |
307 | ||
7950cda7 LH |
308 | if (!matches_merge_filter(commit)) |
309 | return; | |
75e6e213 | 310 | |
af0e4ac0 LH |
311 | switch (item->kind) { |
312 | case REF_LOCAL_BRANCH: | |
313 | color = COLOR_BRANCH_LOCAL; | |
314 | break; | |
315 | case REF_REMOTE_BRANCH: | |
316 | color = COLOR_BRANCH_REMOTE; | |
317 | break; | |
318 | default: | |
319 | color = COLOR_BRANCH_PLAIN; | |
320 | break; | |
321 | } | |
75e6e213 | 322 | |
af0e4ac0 LH |
323 | c = ' '; |
324 | if (current) { | |
325 | c = '*'; | |
326 | color = COLOR_BRANCH_CURRENT; | |
327 | } | |
75e6e213 | 328 | |
af0e4ac0 | 329 | if (verbose) { |
d3f9f9a9 | 330 | struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; |
80583c0e | 331 | const char *sub = " **** invalid ref ****"; |
674d1727 | 332 | |
68067ca1 | 333 | commit = item->commit; |
80583c0e | 334 | if (commit && !parse_commit(commit)) { |
674d1727 | 335 | pretty_print_commit(CMIT_FMT_ONELINE, commit, |
4593fb84 | 336 | &subject, 0, NULL, NULL, 0, 0); |
674d1727 | 337 | sub = subject.buf; |
80583c0e | 338 | } |
94fcb730 JH |
339 | |
340 | if (item->kind == REF_LOCAL_BRANCH) | |
d3f9f9a9 | 341 | fill_tracking_info(&stat, item->name); |
94fcb730 JH |
342 | |
343 | printf("%c %s%-*s%s %s %s%s\n", c, branch_get_color(color), | |
af0e4ac0 LH |
344 | maxwidth, item->name, |
345 | branch_get_color(COLOR_BRANCH_RESET), | |
68067ca1 | 346 | find_unique_abbrev(item->commit->object.sha1, abbrev), |
d3f9f9a9 MV |
347 | stat.buf, sub); |
348 | strbuf_release(&stat); | |
674d1727 | 349 | strbuf_release(&subject); |
af0e4ac0 LH |
350 | } else { |
351 | printf("%c %s%s%s\n", c, branch_get_color(color), item->name, | |
352 | branch_get_color(COLOR_BRANCH_RESET)); | |
353 | } | |
75e6e213 LH |
354 | } |
355 | ||
b6f637d1 LH |
356 | static int calc_maxwidth(struct ref_list *refs) |
357 | { | |
358 | int i, l, w = 0; | |
359 | for (i = 0; i < refs->index; i++) { | |
360 | if (!matches_merge_filter(refs->list[i].commit)) | |
361 | continue; | |
362 | l = strlen(refs->list[i].name); | |
363 | if (l > w) | |
364 | w = l; | |
365 | } | |
366 | return w; | |
367 | } | |
368 | ||
694a5775 | 369 | static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit) |
c31820c2 LH |
370 | { |
371 | int i; | |
bfcc9214 | 372 | struct ref_list ref_list; |
68067ca1 | 373 | struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1); |
c31820c2 | 374 | |
bfcc9214 AP |
375 | memset(&ref_list, 0, sizeof(ref_list)); |
376 | ref_list.kinds = kinds; | |
694a5775 | 377 | ref_list.with_commit = with_commit; |
68067ca1 JH |
378 | if (merge_filter != NO_FILTER) |
379 | init_revisions(&ref_list.revs, NULL); | |
bfcc9214 | 380 | for_each_ref(append_ref, &ref_list); |
68067ca1 JH |
381 | if (merge_filter != NO_FILTER) { |
382 | struct commit *filter; | |
383 | filter = lookup_commit_reference_gently(merge_filter_ref, 0); | |
384 | filter->object.flags |= UNINTERESTING; | |
385 | add_pending_object(&ref_list.revs, | |
386 | (struct object *) filter, ""); | |
387 | ref_list.revs.limited = 1; | |
388 | prepare_revision_walk(&ref_list.revs); | |
b6f637d1 LH |
389 | if (verbose) |
390 | ref_list.maxwidth = calc_maxwidth(&ref_list); | |
68067ca1 | 391 | } |
c31820c2 | 392 | |
bfcc9214 | 393 | qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); |
c31820c2 | 394 | |
0016a482 | 395 | detached = (detached && (kinds & REF_LOCAL_BRANCH)); |
7fcdb36e JG |
396 | if (detached && head_commit && |
397 | is_descendant_of(head_commit, with_commit)) { | |
0016a482 | 398 | struct ref_item item; |
3a55602e | 399 | item.name = xstrdup("(no branch)"); |
0016a482 | 400 | item.kind = REF_LOCAL_BRANCH; |
68067ca1 | 401 | item.commit = head_commit; |
0016a482 | 402 | if (strlen(item.name) > ref_list.maxwidth) |
68067ca1 | 403 | ref_list.maxwidth = strlen(item.name); |
0016a482 | 404 | print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1); |
3a55602e | 405 | free(item.name); |
0016a482 LH |
406 | } |
407 | ||
bfcc9214 | 408 | for (i = 0; i < ref_list.index; i++) { |
0016a482 LH |
409 | int current = !detached && |
410 | (ref_list.list[i].kind == REF_LOCAL_BRANCH) && | |
af0e4ac0 LH |
411 | !strcmp(ref_list.list[i].name, head); |
412 | print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose, | |
413 | abbrev, current); | |
c31820c2 | 414 | } |
bfcc9214 AP |
415 | |
416 | free_ref_list(&ref_list); | |
c31820c2 LH |
417 | } |
418 | ||
c976d415 LH |
419 | static void rename_branch(const char *oldname, const char *newname, int force) |
420 | { | |
da3f78a2 | 421 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
c976d415 | 422 | unsigned char sha1[20]; |
da3f78a2 | 423 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
c976d415 | 424 | |
c847f537 | 425 | if (!oldname) |
3dff5379 | 426 | die("cannot rename the current branch while not on any."); |
c847f537 | 427 | |
da3f78a2 | 428 | strbuf_addf(&oldref, "refs/heads/%s", oldname); |
c976d415 | 429 | |
da3f78a2 MV |
430 | if (check_ref_format(oldref.buf)) |
431 | die("Invalid branch name: %s", oldref.buf); | |
c976d415 | 432 | |
da3f78a2 | 433 | strbuf_addf(&newref, "refs/heads/%s", newname); |
c976d415 | 434 | |
da3f78a2 MV |
435 | if (check_ref_format(newref.buf)) |
436 | die("Invalid branch name: %s", newref.buf); | |
c976d415 | 437 | |
da3f78a2 | 438 | if (resolve_ref(newref.buf, sha1, 1, NULL) && !force) |
c976d415 LH |
439 | die("A branch named '%s' already exists.", newname); |
440 | ||
da3f78a2 MV |
441 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", |
442 | oldref.buf, newref.buf); | |
678d0f4c | 443 | |
da3f78a2 | 444 | if (rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
c976d415 | 445 | die("Branch rename failed"); |
da3f78a2 | 446 | strbuf_release(&logmsg); |
c976d415 | 447 | |
8b5157e4 | 448 | /* no need to pass logmsg here as HEAD didn't really move */ |
da3f78a2 | 449 | if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) |
c976d415 | 450 | die("Branch renamed to %s, but HEAD is not updated!", newname); |
19eba151 | 451 | |
da3f78a2 MV |
452 | strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); |
453 | strbuf_release(&oldref); | |
454 | strbuf_addf(&newsection, "branch.%s", newref.buf + 11); | |
455 | strbuf_release(&newref); | |
456 | if (git_config_rename_section(oldsection.buf, newsection.buf) < 0) | |
19eba151 | 457 | die("Branch is renamed, but update of config-file failed"); |
da3f78a2 MV |
458 | strbuf_release(&oldsection); |
459 | strbuf_release(&newsection); | |
c976d415 LH |
460 | } |
461 | ||
049716b3 JH |
462 | static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset) |
463 | { | |
464 | merge_filter = ((opt->long_name[0] == 'n') | |
465 | ? SHOW_NOT_MERGED | |
466 | : SHOW_MERGED); | |
467 | if (unset) | |
468 | merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */ | |
469 | if (!arg) | |
470 | arg = "HEAD"; | |
471 | if (get_sha1(arg, merge_filter_ref)) | |
472 | die("malformed object name %s", arg); | |
473 | return 0; | |
474 | } | |
475 | ||
c31820c2 LH |
476 | int cmd_branch(int argc, const char **argv, const char *prefix) |
477 | { | |
d11d44fa | 478 | int delete = 0, rename = 0, force_create = 0; |
0016a482 | 479 | int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0; |
9ed36cfa JS |
480 | int reflog = 0; |
481 | enum branch_track track; | |
d11d44fa | 482 | int kinds = REF_LOCAL_BRANCH; |
694a5775 | 483 | struct commit_list *with_commit = NULL; |
a8dfd5ea PH |
484 | |
485 | struct option options[] = { | |
486 | OPT_GROUP("Generic options"), | |
487 | OPT__VERBOSE(&verbose), | |
9ed36cfa JS |
488 | OPT_SET_INT( 0 , "track", &track, "set up tracking mode (see git-pull(1))", |
489 | BRANCH_TRACK_EXPLICIT), | |
a8dfd5ea | 490 | OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"), |
d11d44fa PH |
491 | OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches", |
492 | REF_REMOTE_BRANCH), | |
e84fb2ff JH |
493 | { |
494 | OPTION_CALLBACK, 0, "contains", &with_commit, "commit", | |
495 | "print only branches that contain the commit", | |
496 | PARSE_OPT_LASTARG_DEFAULT, | |
269defdf | 497 | parse_opt_with_commit, (intptr_t)"HEAD", |
e84fb2ff | 498 | }, |
694a5775 JH |
499 | { |
500 | OPTION_CALLBACK, 0, "with", &with_commit, "commit", | |
501 | "print only branches that contain the commit", | |
e84fb2ff | 502 | PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, |
269defdf | 503 | parse_opt_with_commit, (intptr_t) "HEAD", |
694a5775 | 504 | }, |
a8dfd5ea PH |
505 | OPT__ABBREV(&abbrev), |
506 | ||
507 | OPT_GROUP("Specific git-branch actions:"), | |
d11d44fa PH |
508 | OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches", |
509 | REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), | |
510 | OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1), | |
511 | OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2), | |
512 | OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1), | |
513 | OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2), | |
514 | OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"), | |
515 | OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"), | |
049716b3 JH |
516 | { |
517 | OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, | |
518 | "commit", "print only not merged branches", | |
519 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
520 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
521 | }, | |
522 | { | |
523 | OPTION_CALLBACK, 0, "merged", &merge_filter_ref, | |
524 | "commit", "print only merged branches", | |
525 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
526 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
527 | }, | |
a8dfd5ea PH |
528 | OPT_END(), |
529 | }; | |
c31820c2 | 530 | |
ef90d6d4 | 531 | git_config(git_branch_config, NULL); |
6b2f2d98 MK |
532 | |
533 | if (branch_use_color == -1) | |
534 | branch_use_color = git_use_color_default; | |
535 | ||
9ed36cfa | 536 | track = git_branch_track; |
c976d415 | 537 | |
078f8380 | 538 | head = resolve_ref("HEAD", head_sha1, 0, NULL); |
c31820c2 LH |
539 | if (!head) |
540 | die("Failed to resolve HEAD as a valid ref."); | |
078f8380 | 541 | head = xstrdup(head); |
0016a482 LH |
542 | if (!strcmp(head, "HEAD")) { |
543 | detached = 1; | |
a8dfd5ea | 544 | } else { |
cc44c765 | 545 | if (prefixcmp(head, "refs/heads/")) |
0016a482 LH |
546 | die("HEAD not found below refs/heads!"); |
547 | head += 11; | |
548 | } | |
049716b3 JH |
549 | hashcpy(merge_filter_ref, head_sha1); |
550 | ||
551 | argc = parse_options(argc, argv, options, builtin_branch_usage, 0); | |
552 | if (!!delete + !!rename + !!force_create > 1) | |
553 | usage_with_options(builtin_branch_usage, options); | |
c31820c2 LH |
554 | |
555 | if (delete) | |
d11d44fa | 556 | return delete_branches(argc, argv, delete > 1, kinds); |
a8dfd5ea | 557 | else if (argc == 0) |
694a5775 | 558 | print_ref_list(kinds, detached, verbose, abbrev, with_commit); |
a8dfd5ea | 559 | else if (rename && (argc == 1)) |
d11d44fa | 560 | rename_branch(head, argv[0], rename > 1); |
a8dfd5ea | 561 | else if (rename && (argc == 2)) |
d11d44fa | 562 | rename_branch(argv[0], argv[1], rename > 1); |
6e8f993a MM |
563 | else if (argc <= 2) { |
564 | if (kinds != REF_LOCAL_BRANCH) | |
565 | die("-a and -r options to 'git branch' do not make sense with a branch name"); | |
e496c003 | 566 | create_branch(head, argv[0], (argc == 2) ? argv[1] : head, |
45994a1e | 567 | force_create, reflog, track); |
6e8f993a | 568 | } else |
a8dfd5ea | 569 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
570 | |
571 | return 0; | |
572 | } |