]>
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 PH |
14 | #include "parse-options.h" |
15 | ||
16 | static const char * const builtin_branch_usage[] = { | |
17 | "git-branch [options] [-r | -a]", | |
18 | "git-branch [options] [-l] [-f] <branchname> [<start-point>]", | |
19 | "git-branch [options] [-r] (-d | -D) <branchname>", | |
20 | "git-branch [options] (-m | -M) [<oldbranch>] <newbranch>", | |
21 | NULL | |
22 | }; | |
c31820c2 | 23 | |
f3d985c3 JH |
24 | #define REF_UNKNOWN_TYPE 0x00 |
25 | #define REF_LOCAL_BRANCH 0x01 | |
26 | #define REF_REMOTE_BRANCH 0x02 | |
27 | #define REF_TAG 0x04 | |
c31820c2 LH |
28 | |
29 | static const char *head; | |
30 | static unsigned char head_sha1[20]; | |
31 | ||
6f084a56 | 32 | static int branch_track = 1; |
0746d19a | 33 | |
a1158cae AP |
34 | static int branch_use_color; |
35 | static char branch_colors[][COLOR_MAXLEN] = { | |
36 | "\033[m", /* reset */ | |
37 | "", /* PLAIN (normal) */ | |
38 | "\033[31m", /* REMOTE (red) */ | |
753f96a4 JH |
39 | "", /* LOCAL (normal) */ |
40 | "\033[32m", /* CURRENT (green) */ | |
a1158cae AP |
41 | }; |
42 | enum color_branch { | |
43 | COLOR_BRANCH_RESET = 0, | |
44 | COLOR_BRANCH_PLAIN = 1, | |
45 | COLOR_BRANCH_REMOTE = 2, | |
46 | COLOR_BRANCH_LOCAL = 3, | |
47 | COLOR_BRANCH_CURRENT = 4, | |
48 | }; | |
49 | ||
50 | static int parse_branch_color_slot(const char *var, int ofs) | |
51 | { | |
52 | if (!strcasecmp(var+ofs, "plain")) | |
53 | return COLOR_BRANCH_PLAIN; | |
54 | if (!strcasecmp(var+ofs, "reset")) | |
55 | return COLOR_BRANCH_RESET; | |
56 | if (!strcasecmp(var+ofs, "remote")) | |
57 | return COLOR_BRANCH_REMOTE; | |
58 | if (!strcasecmp(var+ofs, "local")) | |
59 | return COLOR_BRANCH_LOCAL; | |
60 | if (!strcasecmp(var+ofs, "current")) | |
61 | return COLOR_BRANCH_CURRENT; | |
62 | die("bad config variable '%s'", var); | |
63 | } | |
64 | ||
52fae7de | 65 | static int git_branch_config(const char *var, const char *value) |
a1158cae AP |
66 | { |
67 | if (!strcmp(var, "color.branch")) { | |
68 | branch_use_color = git_config_colorbool(var, value); | |
69 | return 0; | |
70 | } | |
cc44c765 | 71 | if (!prefixcmp(var, "color.branch.")) { |
a1158cae AP |
72 | int slot = parse_branch_color_slot(var, 13); |
73 | color_parse(value, var, branch_colors[slot]); | |
74 | return 0; | |
75 | } | |
6f084a56 | 76 | if (!strcmp(var, "branch.autosetupmerge")) |
4017761f | 77 | branch_track = git_config_bool(var, value); |
0746d19a | 78 | |
a1158cae AP |
79 | return git_default_config(var, value); |
80 | } | |
81 | ||
52fae7de | 82 | static const char *branch_get_color(enum color_branch ix) |
a1158cae AP |
83 | { |
84 | if (branch_use_color) | |
85 | return branch_colors[ix]; | |
86 | return ""; | |
87 | } | |
88 | ||
b8e9a00d | 89 | static int delete_branches(int argc, const char **argv, int force, int kinds) |
c31820c2 | 90 | { |
67affd51 | 91 | struct commit *rev, *head_rev = head_rev; |
c31820c2 | 92 | unsigned char sha1[20]; |
b8e9a00d | 93 | char *name = NULL; |
f3d985c3 | 94 | const char *fmt, *remote; |
f1eccbab | 95 | char section[PATH_MAX]; |
c31820c2 | 96 | int i; |
b8e9a00d | 97 | int ret = 0; |
c31820c2 | 98 | |
f3d985c3 JH |
99 | switch (kinds) { |
100 | case REF_REMOTE_BRANCH: | |
101 | fmt = "refs/remotes/%s"; | |
102 | remote = "remote "; | |
103 | force = 1; | |
104 | break; | |
105 | case REF_LOCAL_BRANCH: | |
106 | fmt = "refs/heads/%s"; | |
107 | remote = ""; | |
108 | break; | |
109 | default: | |
110 | die("cannot use -a with -d"); | |
111 | } | |
c31820c2 | 112 | |
67affd51 JH |
113 | if (!force) { |
114 | head_rev = lookup_commit_reference(head_sha1); | |
115 | if (!head_rev) | |
116 | die("Couldn't look up commit object for HEAD"); | |
117 | } | |
c31820c2 | 118 | for (i = 0; i < argc; i++) { |
b8e9a00d QT |
119 | if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i])) { |
120 | error("Cannot delete the branch '%s' " | |
121 | "which you are currently on.", argv[i]); | |
122 | ret = 1; | |
123 | continue; | |
124 | } | |
125 | ||
126 | if (name) | |
127 | free(name); | |
c31820c2 | 128 | |
f3d985c3 | 129 | name = xstrdup(mkpath(fmt, argv[i])); |
b8e9a00d QT |
130 | if (!resolve_ref(name, sha1, 1, NULL)) { |
131 | error("%sbranch '%s' not found.", | |
132 | remote, argv[i]); | |
133 | ret = 1; | |
134 | continue; | |
135 | } | |
c31820c2 LH |
136 | |
137 | rev = lookup_commit_reference(sha1); | |
b8e9a00d QT |
138 | if (!rev) { |
139 | error("Couldn't look up commit object for '%s'", name); | |
140 | ret = 1; | |
141 | continue; | |
142 | } | |
c31820c2 LH |
143 | |
144 | /* This checks whether the merge bases of branch and | |
145 | * HEAD contains branch -- which means that the HEAD | |
146 | * contains everything in both. | |
147 | */ | |
148 | ||
149 | if (!force && | |
03840fc3 | 150 | !in_merge_bases(rev, &head_rev, 1)) { |
00ae8289 | 151 | error("The branch '%s' is not an ancestor of " |
b8e9a00d QT |
152 | "your current HEAD.\n" |
153 | "If you are sure you want to delete it, " | |
154 | "run 'git branch -D %s'.", argv[i], argv[i]); | |
155 | ret = 1; | |
156 | continue; | |
c31820c2 LH |
157 | } |
158 | ||
b8e9a00d QT |
159 | if (delete_ref(name, sha1)) { |
160 | error("Error deleting %sbranch '%s'", remote, | |
f3d985c3 | 161 | argv[i]); |
b8e9a00d | 162 | ret = 1; |
f1eccbab | 163 | } else { |
f3d985c3 | 164 | printf("Deleted %sbranch %s.\n", remote, argv[i]); |
f1eccbab GP |
165 | snprintf(section, sizeof(section), "branch.%s", |
166 | argv[i]); | |
167 | if (git_config_rename_section(section, NULL) < 0) | |
168 | warning("Update of config-file failed"); | |
169 | } | |
c31820c2 | 170 | } |
c31820c2 | 171 | |
b8e9a00d QT |
172 | if (name) |
173 | free(name); | |
174 | ||
175 | return(ret); | |
c31820c2 | 176 | } |
c31820c2 | 177 | |
bfcc9214 AP |
178 | struct ref_item { |
179 | char *name; | |
180 | unsigned int kind; | |
75e6e213 | 181 | unsigned char sha1[20]; |
bfcc9214 AP |
182 | }; |
183 | ||
184 | struct ref_list { | |
75e6e213 | 185 | int index, alloc, maxwidth; |
bfcc9214 AP |
186 | struct ref_item *list; |
187 | int kinds; | |
188 | }; | |
189 | ||
190 | static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) | |
c31820c2 | 191 | { |
bfcc9214 AP |
192 | struct ref_list *ref_list = (struct ref_list*)(cb_data); |
193 | struct ref_item *newitem; | |
194 | int kind = REF_UNKNOWN_TYPE; | |
75e6e213 | 195 | int len; |
bfcc9214 AP |
196 | |
197 | /* Detect kind */ | |
cc44c765 | 198 | if (!prefixcmp(refname, "refs/heads/")) { |
bfcc9214 AP |
199 | kind = REF_LOCAL_BRANCH; |
200 | refname += 11; | |
cc44c765 | 201 | } else if (!prefixcmp(refname, "refs/remotes/")) { |
bfcc9214 AP |
202 | kind = REF_REMOTE_BRANCH; |
203 | refname += 13; | |
cc44c765 | 204 | } else if (!prefixcmp(refname, "refs/tags/")) { |
bfcc9214 AP |
205 | kind = REF_TAG; |
206 | refname += 10; | |
207 | } | |
208 | ||
209 | /* Don't add types the caller doesn't want */ | |
210 | if ((kind & ref_list->kinds) == 0) | |
211 | return 0; | |
212 | ||
213 | /* Resize buffer */ | |
214 | if (ref_list->index >= ref_list->alloc) { | |
215 | ref_list->alloc = alloc_nr(ref_list->alloc); | |
216 | ref_list->list = xrealloc(ref_list->list, | |
217 | ref_list->alloc * sizeof(struct ref_item)); | |
c31820c2 LH |
218 | } |
219 | ||
bfcc9214 AP |
220 | /* Record the new item */ |
221 | newitem = &(ref_list->list[ref_list->index++]); | |
222 | newitem->name = xstrdup(refname); | |
223 | newitem->kind = kind; | |
75e6e213 LH |
224 | hashcpy(newitem->sha1, sha1); |
225 | len = strlen(newitem->name); | |
226 | if (len > ref_list->maxwidth) | |
227 | ref_list->maxwidth = len; | |
c31820c2 LH |
228 | |
229 | return 0; | |
230 | } | |
231 | ||
bfcc9214 AP |
232 | static void free_ref_list(struct ref_list *ref_list) |
233 | { | |
234 | int i; | |
235 | ||
236 | for (i = 0; i < ref_list->index; i++) | |
237 | free(ref_list->list[i].name); | |
238 | free(ref_list->list); | |
239 | } | |
240 | ||
c31820c2 LH |
241 | static int ref_cmp(const void *r1, const void *r2) |
242 | { | |
bfcc9214 AP |
243 | struct ref_item *c1 = (struct ref_item *)(r1); |
244 | struct ref_item *c2 = (struct ref_item *)(r2); | |
245 | ||
246 | if (c1->kind != c2->kind) | |
247 | return c1->kind - c2->kind; | |
248 | return strcmp(c1->name, c2->name); | |
c31820c2 LH |
249 | } |
250 | ||
af0e4ac0 LH |
251 | static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, |
252 | int abbrev, int current) | |
75e6e213 | 253 | { |
af0e4ac0 LH |
254 | char c; |
255 | int color; | |
75e6e213 | 256 | struct commit *commit; |
75e6e213 | 257 | |
af0e4ac0 LH |
258 | switch (item->kind) { |
259 | case REF_LOCAL_BRANCH: | |
260 | color = COLOR_BRANCH_LOCAL; | |
261 | break; | |
262 | case REF_REMOTE_BRANCH: | |
263 | color = COLOR_BRANCH_REMOTE; | |
264 | break; | |
265 | default: | |
266 | color = COLOR_BRANCH_PLAIN; | |
267 | break; | |
268 | } | |
75e6e213 | 269 | |
af0e4ac0 LH |
270 | c = ' '; |
271 | if (current) { | |
272 | c = '*'; | |
273 | color = COLOR_BRANCH_CURRENT; | |
274 | } | |
75e6e213 | 275 | |
af0e4ac0 | 276 | if (verbose) { |
674d1727 | 277 | struct strbuf subject; |
80583c0e JH |
278 | const char *sub = " **** invalid ref ****"; |
279 | ||
674d1727 PH |
280 | strbuf_init(&subject, 0); |
281 | ||
af0e4ac0 | 282 | commit = lookup_commit(item->sha1); |
80583c0e | 283 | if (commit && !parse_commit(commit)) { |
674d1727 | 284 | pretty_print_commit(CMIT_FMT_ONELINE, commit, |
4593fb84 | 285 | &subject, 0, NULL, NULL, 0, 0); |
674d1727 | 286 | sub = subject.buf; |
80583c0e | 287 | } |
af0e4ac0 LH |
288 | printf("%c %s%-*s%s %s %s\n", c, branch_get_color(color), |
289 | maxwidth, item->name, | |
290 | branch_get_color(COLOR_BRANCH_RESET), | |
80583c0e | 291 | find_unique_abbrev(item->sha1, abbrev), sub); |
674d1727 | 292 | strbuf_release(&subject); |
af0e4ac0 LH |
293 | } else { |
294 | printf("%c %s%s%s\n", c, branch_get_color(color), item->name, | |
295 | branch_get_color(COLOR_BRANCH_RESET)); | |
296 | } | |
75e6e213 LH |
297 | } |
298 | ||
0016a482 | 299 | static void print_ref_list(int kinds, int detached, int verbose, int abbrev) |
c31820c2 LH |
300 | { |
301 | int i; | |
bfcc9214 | 302 | struct ref_list ref_list; |
c31820c2 | 303 | |
bfcc9214 AP |
304 | memset(&ref_list, 0, sizeof(ref_list)); |
305 | ref_list.kinds = kinds; | |
306 | for_each_ref(append_ref, &ref_list); | |
c31820c2 | 307 | |
bfcc9214 | 308 | qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); |
c31820c2 | 309 | |
0016a482 LH |
310 | detached = (detached && (kinds & REF_LOCAL_BRANCH)); |
311 | if (detached) { | |
312 | struct ref_item item; | |
3a55602e | 313 | item.name = xstrdup("(no branch)"); |
0016a482 LH |
314 | item.kind = REF_LOCAL_BRANCH; |
315 | hashcpy(item.sha1, head_sha1); | |
316 | if (strlen(item.name) > ref_list.maxwidth) | |
317 | ref_list.maxwidth = strlen(item.name); | |
318 | print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1); | |
3a55602e | 319 | free(item.name); |
0016a482 LH |
320 | } |
321 | ||
bfcc9214 | 322 | for (i = 0; i < ref_list.index; i++) { |
0016a482 LH |
323 | int current = !detached && |
324 | (ref_list.list[i].kind == REF_LOCAL_BRANCH) && | |
af0e4ac0 LH |
325 | !strcmp(ref_list.list[i].name, head); |
326 | print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose, | |
327 | abbrev, current); | |
c31820c2 | 328 | } |
bfcc9214 AP |
329 | |
330 | free_ref_list(&ref_list); | |
c31820c2 LH |
331 | } |
332 | ||
6f084a56 JS |
333 | struct tracking { |
334 | struct refspec spec; | |
335 | char *src; | |
336 | const char *remote; | |
337 | int matches; | |
338 | }; | |
0746d19a | 339 | |
6f084a56 | 340 | static int find_tracked_branch(struct remote *remote, void *priv) |
0746d19a | 341 | { |
6f084a56 | 342 | struct tracking *tracking = priv; |
0746d19a | 343 | |
6f084a56 JS |
344 | if (!remote_find_tracking(remote, &tracking->spec)) { |
345 | if (++tracking->matches == 1) { | |
346 | tracking->src = tracking->spec.src; | |
347 | tracking->remote = remote->name; | |
348 | } else { | |
349 | free(tracking->spec.src); | |
350 | if (tracking->src) { | |
351 | free(tracking->src); | |
352 | tracking->src = NULL; | |
353 | } | |
354 | } | |
355 | tracking->spec.src = NULL; | |
0746d19a PB |
356 | } |
357 | ||
0746d19a PB |
358 | return 0; |
359 | } | |
360 | ||
6f084a56 JS |
361 | |
362 | /* | |
363 | * This is called when new_ref is branched off of orig_ref, and tries | |
364 | * to infer the settings for branch.<new_ref>.{remote,merge} from the | |
365 | * config. | |
366 | */ | |
367 | static int setup_tracking(const char *new_ref, const char *orig_ref) | |
0746d19a PB |
368 | { |
369 | char key[1024]; | |
6f084a56 | 370 | struct tracking tracking; |
9debc324 | 371 | |
6f084a56 JS |
372 | if (strlen(new_ref) > 1024 - 7 - 7 - 1) |
373 | return error("Tracking not set up: name too long: %s", | |
374 | new_ref); | |
0746d19a | 375 | |
6f084a56 JS |
376 | memset(&tracking, 0, sizeof(tracking)); |
377 | tracking.spec.dst = (char *)orig_ref; | |
378 | if (for_each_remote(find_tracked_branch, &tracking) || | |
379 | !tracking.matches) | |
380 | return 1; | |
381 | ||
382 | if (tracking.matches > 1) | |
383 | return error("Not tracking: ambiguous information for ref %s", | |
384 | orig_ref); | |
385 | ||
386 | if (tracking.matches == 1) { | |
387 | sprintf(key, "branch.%s.remote", new_ref); | |
388 | git_config_set(key, tracking.remote ? tracking.remote : "."); | |
389 | sprintf(key, "branch.%s.merge", new_ref); | |
390 | git_config_set(key, tracking.src); | |
391 | free(tracking.src); | |
0746d19a | 392 | printf("Branch %s set up to track remote branch %s.\n", |
6f084a56 | 393 | new_ref, orig_ref); |
0746d19a PB |
394 | } |
395 | ||
6f084a56 | 396 | return 0; |
0746d19a PB |
397 | } |
398 | ||
c847f537 | 399 | static void create_branch(const char *name, const char *start_name, |
0746d19a | 400 | int force, int reflog, int track) |
c31820c2 LH |
401 | { |
402 | struct ref_lock *lock; | |
403 | struct commit *commit; | |
404 | unsigned char sha1[20]; | |
0746d19a | 405 | char *real_ref, ref[PATH_MAX], msg[PATH_MAX + 20]; |
5f856dd4 | 406 | int forcing = 0; |
c31820c2 LH |
407 | |
408 | snprintf(ref, sizeof ref, "refs/heads/%s", name); | |
409 | if (check_ref_format(ref)) | |
410 | die("'%s' is not a valid branch name.", name); | |
411 | ||
412 | if (resolve_ref(ref, sha1, 1, NULL)) { | |
413 | if (!force) | |
414 | die("A branch named '%s' already exists.", name); | |
11a6ddb2 | 415 | else if (!is_bare_repository() && !strcmp(head, name)) |
c31820c2 | 416 | die("Cannot force update the current branch."); |
5f856dd4 | 417 | forcing = 1; |
c31820c2 LH |
418 | } |
419 | ||
45994a1e JH |
420 | real_ref = NULL; |
421 | if (get_sha1(start_name, sha1)) | |
422 | die("Not a valid object name: '%s'.", start_name); | |
423 | ||
424 | switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) { | |
425 | case 0: | |
426 | /* Not branching from any existing branch */ | |
0746d19a | 427 | real_ref = NULL; |
45994a1e JH |
428 | break; |
429 | case 1: | |
430 | /* Unique completion -- good */ | |
431 | break; | |
432 | default: | |
0746d19a | 433 | die("Ambiguous object name: '%s'.", start_name); |
45994a1e JH |
434 | break; |
435 | } | |
c847f537 JH |
436 | |
437 | if ((commit = lookup_commit_reference(sha1)) == NULL) | |
438 | die("Not a valid branch point: '%s'.", start_name); | |
c31820c2 LH |
439 | hashcpy(sha1, commit->object.sha1); |
440 | ||
68db31cc | 441 | lock = lock_any_ref_for_update(ref, NULL, 0); |
c31820c2 LH |
442 | if (!lock) |
443 | die("Failed to lock ref for update: %s.", strerror(errno)); | |
444 | ||
5f856dd4 | 445 | if (reflog) |
c31820c2 | 446 | log_all_ref_updates = 1; |
5f856dd4 JH |
447 | |
448 | if (forcing) | |
449 | snprintf(msg, sizeof msg, "branch: Reset from %s", | |
450 | start_name); | |
451 | else | |
c847f537 JH |
452 | snprintf(msg, sizeof msg, "branch: Created from %s", |
453 | start_name); | |
c31820c2 | 454 | |
0746d19a PB |
455 | /* When branching off a remote branch, set up so that git-pull |
456 | automatically merges from there. So far, this is only done for | |
457 | remotes registered via .git/config. */ | |
6f084a56 JS |
458 | if (real_ref && track) |
459 | setup_tracking(name, real_ref); | |
0746d19a | 460 | |
c31820c2 LH |
461 | if (write_ref_sha1(lock, sha1, msg) < 0) |
462 | die("Failed to write ref: %s.", strerror(errno)); | |
0746d19a PB |
463 | |
464 | if (real_ref) | |
465 | free(real_ref); | |
c31820c2 LH |
466 | } |
467 | ||
c976d415 LH |
468 | static void rename_branch(const char *oldname, const char *newname, int force) |
469 | { | |
678d0f4c | 470 | char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100]; |
c976d415 | 471 | unsigned char sha1[20]; |
19eba151 | 472 | char oldsection[PATH_MAX], newsection[PATH_MAX]; |
c976d415 | 473 | |
c847f537 | 474 | if (!oldname) |
3dff5379 | 475 | die("cannot rename the current branch while not on any."); |
c847f537 | 476 | |
c976d415 LH |
477 | if (snprintf(oldref, sizeof(oldref), "refs/heads/%s", oldname) > sizeof(oldref)) |
478 | die("Old branchname too long"); | |
479 | ||
480 | if (check_ref_format(oldref)) | |
481 | die("Invalid branch name: %s", oldref); | |
482 | ||
483 | if (snprintf(newref, sizeof(newref), "refs/heads/%s", newname) > sizeof(newref)) | |
484 | die("New branchname too long"); | |
485 | ||
486 | if (check_ref_format(newref)) | |
487 | die("Invalid branch name: %s", newref); | |
488 | ||
489 | if (resolve_ref(newref, sha1, 1, NULL) && !force) | |
490 | die("A branch named '%s' already exists.", newname); | |
491 | ||
678d0f4c LH |
492 | snprintf(logmsg, sizeof(logmsg), "Branch: renamed %s to %s", |
493 | oldref, newref); | |
494 | ||
495 | if (rename_ref(oldref, newref, logmsg)) | |
c976d415 LH |
496 | die("Branch rename failed"); |
497 | ||
8b5157e4 NP |
498 | /* no need to pass logmsg here as HEAD didn't really move */ |
499 | if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL)) | |
c976d415 | 500 | die("Branch renamed to %s, but HEAD is not updated!", newname); |
19eba151 LH |
501 | |
502 | snprintf(oldsection, sizeof(oldsection), "branch.%s", oldref + 11); | |
503 | snprintf(newsection, sizeof(newsection), "branch.%s", newref + 11); | |
504 | if (git_config_rename_section(oldsection, newsection) < 0) | |
505 | die("Branch is renamed, but update of config-file failed"); | |
c976d415 LH |
506 | } |
507 | ||
c31820c2 LH |
508 | int cmd_branch(int argc, const char **argv, const char *prefix) |
509 | { | |
bfcc9214 | 510 | int delete = 0, force_delete = 0, force_create = 0; |
c976d415 | 511 | int rename = 0, force_rename = 0; |
0016a482 | 512 | int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0; |
0746d19a | 513 | int reflog = 0, track; |
a8dfd5ea PH |
514 | int kinds = REF_LOCAL_BRANCH, kind_remote = 0, kind_any = 0; |
515 | ||
516 | struct option options[] = { | |
517 | OPT_GROUP("Generic options"), | |
518 | OPT__VERBOSE(&verbose), | |
519 | OPT_BOOLEAN( 0 , "track", &track, "set up tracking mode (see git-pull(1))"), | |
520 | OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"), | |
521 | OPT_BOOLEAN('r', NULL, &kind_remote, "act on remote-tracking branches"), | |
522 | OPT__ABBREV(&abbrev), | |
523 | ||
524 | OPT_GROUP("Specific git-branch actions:"), | |
525 | OPT_BOOLEAN('a', NULL, &kind_any, "list both remote-tracking and local branches"), | |
526 | OPT_BOOLEAN('d', NULL, &delete, "delete fully merged branch"), | |
527 | OPT_BOOLEAN('D', NULL, &force_delete, "delete branch (even if not merged)"), | |
528 | OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"), | |
529 | OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"), | |
530 | OPT_BOOLEAN('m', NULL, &rename, "move/rename a branch and its reflog"), | |
531 | OPT_BOOLEAN('M', NULL, &force_rename, "move/rename a branch, even if target exists"), | |
532 | OPT_END(), | |
533 | }; | |
c31820c2 | 534 | |
a1158cae | 535 | git_config(git_branch_config); |
4017761f | 536 | track = branch_track; |
a8dfd5ea PH |
537 | argc = parse_options(argc, argv, options, builtin_branch_usage, 0); |
538 | ||
539 | delete |= force_delete; | |
540 | rename |= force_rename; | |
541 | if (kind_remote) | |
542 | kinds = REF_REMOTE_BRANCH; | |
543 | if (kind_any) | |
544 | kinds = REF_REMOTE_BRANCH | REF_LOCAL_BRANCH; | |
545 | if (abbrev && abbrev < MINIMUM_ABBREV) | |
546 | abbrev = MINIMUM_ABBREV; | |
547 | else if (abbrev > 40) | |
548 | abbrev = 40; | |
c31820c2 | 549 | |
c976d415 LH |
550 | if ((delete && rename) || (delete && force_create) || |
551 | (rename && force_create)) | |
a8dfd5ea | 552 | usage_with_options(builtin_branch_usage, options); |
c976d415 | 553 | |
078f8380 | 554 | head = resolve_ref("HEAD", head_sha1, 0, NULL); |
c31820c2 LH |
555 | if (!head) |
556 | die("Failed to resolve HEAD as a valid ref."); | |
078f8380 | 557 | head = xstrdup(head); |
0016a482 LH |
558 | if (!strcmp(head, "HEAD")) { |
559 | detached = 1; | |
a8dfd5ea | 560 | } else { |
cc44c765 | 561 | if (prefixcmp(head, "refs/heads/")) |
0016a482 LH |
562 | die("HEAD not found below refs/heads!"); |
563 | head += 11; | |
564 | } | |
c31820c2 LH |
565 | |
566 | if (delete) | |
a8dfd5ea PH |
567 | return delete_branches(argc, argv, force_delete, kinds); |
568 | else if (argc == 0) | |
0016a482 | 569 | print_ref_list(kinds, detached, verbose, abbrev); |
a8dfd5ea PH |
570 | else if (rename && (argc == 1)) |
571 | rename_branch(head, argv[0], force_rename); | |
572 | else if (rename && (argc == 2)) | |
573 | rename_branch(argv[0], argv[1], force_rename); | |
574 | else if (argc <= 2) | |
575 | create_branch(argv[0], (argc == 2) ? argv[1] : head, | |
45994a1e | 576 | force_create, reflog, track); |
c31820c2 | 577 | else |
a8dfd5ea | 578 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
579 | |
580 | return 0; | |
581 | } |