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