]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - builtin/describe.c
The sixth batch
[thirdparty/git.git] / builtin / describe.c
... / ...
CommitLineData
1#define USE_THE_REPOSITORY_VARIABLE
2#define DISABLE_SIGN_COMPARE_WARNINGS
3
4#include "builtin.h"
5#include "config.h"
6#include "environment.h"
7#include "gettext.h"
8#include "hex.h"
9#include "lockfile.h"
10#include "commit.h"
11#include "tag.h"
12#include "refs.h"
13#include "object-name.h"
14#include "parse-options.h"
15#include "read-cache-ll.h"
16#include "revision.h"
17#include "diff.h"
18#include "hashmap.h"
19#include "setup.h"
20#include "strvec.h"
21#include "run-command.h"
22#include "object-store.h"
23#include "list-objects.h"
24#include "commit-slab.h"
25#include "wildmatch.h"
26
27#define MAX_TAGS (FLAG_BITS - 1)
28#define DEFAULT_CANDIDATES 10
29
30define_commit_slab(commit_names, struct commit_name *);
31
32static const char * const describe_usage[] = {
33 N_("git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"),
34 N_("git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"),
35 N_("git describe <blob>"),
36 NULL
37};
38
39static int debug; /* Display lots of verbose info */
40static int all; /* Any valid ref can be used */
41static int tags; /* Allow lightweight tags */
42static int longformat;
43static int first_parent;
44static int abbrev = -1; /* unspecified */
45static int max_candidates = DEFAULT_CANDIDATES;
46static struct hashmap names;
47static int have_util;
48static struct string_list patterns = STRING_LIST_INIT_NODUP;
49static struct string_list exclude_patterns = STRING_LIST_INIT_NODUP;
50static int always;
51static const char *suffix, *dirty, *broken;
52static struct commit_names commit_names;
53
54/* diff-index command arguments to check if working tree is dirty. */
55static const char *diff_index_args[] = {
56 "diff-index", "--quiet", "HEAD", "--", NULL
57};
58
59static const char *update_index_args[] = {
60 "update-index", "--unmerged", "-q", "--refresh", NULL
61};
62
63struct commit_name {
64 struct hashmap_entry entry;
65 struct object_id peeled;
66 struct tag *tag;
67 unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */
68 unsigned name_checked:1;
69 unsigned misnamed:1;
70 struct object_id oid;
71 char *path;
72};
73
74static const char *prio_names[] = {
75 N_("head"), N_("lightweight"), N_("annotated"),
76};
77
78static int commit_name_neq(const void *cmp_data UNUSED,
79 const struct hashmap_entry *eptr,
80 const struct hashmap_entry *entry_or_key,
81 const void *peeled)
82{
83 const struct commit_name *cn1, *cn2;
84
85 cn1 = container_of(eptr, const struct commit_name, entry);
86 cn2 = container_of(entry_or_key, const struct commit_name, entry);
87
88 return !oideq(&cn1->peeled, peeled ? peeled : &cn2->peeled);
89}
90
91static inline struct commit_name *find_commit_name(const struct object_id *peeled)
92{
93 return hashmap_get_entry_from_hash(&names, oidhash(peeled), peeled,
94 struct commit_name, entry);
95}
96
97static int replace_name(struct commit_name *e,
98 int prio,
99 const struct object_id *oid,
100 struct tag **tag)
101{
102 if (!e || e->prio < prio)
103 return 1;
104
105 if (e->prio == 2 && prio == 2) {
106 /* Multiple annotated tags point to the same commit.
107 * Select one to keep based upon their tagger date.
108 */
109 struct tag *t;
110
111 if (!e->tag) {
112 t = lookup_tag(the_repository, &e->oid);
113 if (!t || parse_tag(t))
114 return 1;
115 e->tag = t;
116 }
117
118 t = lookup_tag(the_repository, oid);
119 if (!t || parse_tag(t))
120 return 0;
121 *tag = t;
122
123 if (e->tag->date < t->date)
124 return 1;
125 }
126
127 return 0;
128}
129
130static void add_to_known_names(const char *path,
131 const struct object_id *peeled,
132 int prio,
133 const struct object_id *oid)
134{
135 struct commit_name *e = find_commit_name(peeled);
136 struct tag *tag = NULL;
137 if (replace_name(e, prio, oid, &tag)) {
138 if (!e) {
139 e = xmalloc(sizeof(struct commit_name));
140 oidcpy(&e->peeled, peeled);
141 hashmap_entry_init(&e->entry, oidhash(peeled));
142 hashmap_add(&names, &e->entry);
143 e->path = NULL;
144 }
145 e->tag = tag;
146 e->prio = prio;
147 e->name_checked = 0;
148 e->misnamed = 0;
149 oidcpy(&e->oid, oid);
150 free(e->path);
151 e->path = xstrdup(path);
152 }
153}
154
155static int get_name(const char *path, const char *referent UNUSED, const struct object_id *oid,
156 int flag UNUSED, void *cb_data UNUSED)
157{
158 int is_tag = 0;
159 struct object_id peeled;
160 int is_annotated, prio;
161 const char *path_to_match = NULL;
162
163 if (skip_prefix(path, "refs/tags/", &path_to_match)) {
164 is_tag = 1;
165 } else if (all) {
166 if ((exclude_patterns.nr || patterns.nr) &&
167 !skip_prefix(path, "refs/heads/", &path_to_match) &&
168 !skip_prefix(path, "refs/remotes/", &path_to_match)) {
169 /* Only accept reference of known type if there are match/exclude patterns */
170 return 0;
171 }
172 } else {
173 /* Reject anything outside refs/tags/ unless --all */
174 return 0;
175 }
176
177 /*
178 * If we're given exclude patterns, first exclude any tag which match
179 * any of the exclude pattern.
180 */
181 if (exclude_patterns.nr) {
182 struct string_list_item *item;
183
184 for_each_string_list_item(item, &exclude_patterns) {
185 if (!wildmatch(item->string, path_to_match, 0))
186 return 0;
187 }
188 }
189
190 /*
191 * If we're given patterns, accept only tags which match at least one
192 * pattern.
193 */
194 if (patterns.nr) {
195 int found = 0;
196 struct string_list_item *item;
197
198 for_each_string_list_item(item, &patterns) {
199 if (!wildmatch(item->string, path_to_match, 0)) {
200 found = 1;
201 break;
202 }
203 }
204
205 if (!found)
206 return 0;
207 }
208
209 /* Is it annotated? */
210 if (!peel_iterated_oid(the_repository, oid, &peeled)) {
211 is_annotated = !oideq(oid, &peeled);
212 } else {
213 oidcpy(&peeled, oid);
214 is_annotated = 0;
215 }
216
217 /*
218 * By default, we only use annotated tags, but with --tags
219 * we fall back to lightweight ones (even without --tags,
220 * we still remember lightweight ones, only to give hints
221 * in an error message). --all allows any refs to be used.
222 */
223 if (is_annotated)
224 prio = 2;
225 else if (is_tag)
226 prio = 1;
227 else
228 prio = 0;
229
230 add_to_known_names(all ? path + 5 : path + 10, &peeled, prio, oid);
231 return 0;
232}
233
234struct possible_tag {
235 struct commit_name *name;
236 int depth;
237 int found_order;
238 unsigned flag_within;
239};
240
241static int compare_pt(const void *a_, const void *b_)
242{
243 struct possible_tag *a = (struct possible_tag *)a_;
244 struct possible_tag *b = (struct possible_tag *)b_;
245 if (a->depth != b->depth)
246 return a->depth - b->depth;
247 if (a->found_order != b->found_order)
248 return a->found_order - b->found_order;
249 return 0;
250}
251
252static unsigned long finish_depth_computation(
253 struct commit_list **list,
254 struct possible_tag *best)
255{
256 unsigned long seen_commits = 0;
257 while (*list) {
258 struct commit *c = pop_commit(list);
259 struct commit_list *parents = c->parents;
260 seen_commits++;
261 if (c->object.flags & best->flag_within) {
262 struct commit_list *a = *list;
263 while (a) {
264 struct commit *i = a->item;
265 if (!(i->object.flags & best->flag_within))
266 break;
267 a = a->next;
268 }
269 if (!a)
270 break;
271 } else
272 best->depth++;
273 while (parents) {
274 struct commit *p = parents->item;
275 repo_parse_commit(the_repository, p);
276 if (!(p->object.flags & SEEN))
277 commit_list_insert_by_date(p, list);
278 p->object.flags |= c->object.flags;
279 parents = parents->next;
280 }
281 }
282 return seen_commits;
283}
284
285static void append_name(struct commit_name *n, struct strbuf *dst)
286{
287 if (n->prio == 2 && !n->tag) {
288 n->tag = lookup_tag(the_repository, &n->oid);
289 if (!n->tag || parse_tag(n->tag))
290 die(_("annotated tag %s not available"), n->path);
291 }
292 if (n->tag && !n->name_checked) {
293 if (strcmp(n->tag->tag, all ? n->path + 5 : n->path)) {
294 warning(_("tag '%s' is externally known as '%s'"),
295 n->path, n->tag->tag);
296 n->misnamed = 1;
297 }
298 n->name_checked = 1;
299 }
300
301 if (n->tag) {
302 if (all)
303 strbuf_addstr(dst, "tags/");
304 strbuf_addstr(dst, n->tag->tag);
305 } else {
306 strbuf_addstr(dst, n->path);
307 }
308}
309
310static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)
311{
312 strbuf_addf(dst, "-%d-g%s", depth,
313 repo_find_unique_abbrev(the_repository, oid, abbrev));
314}
315
316static void describe_commit(struct object_id *oid, struct strbuf *dst)
317{
318 struct commit *cmit, *gave_up_on = NULL;
319 struct commit_list *list;
320 struct commit_name *n;
321 struct possible_tag all_matches[MAX_TAGS];
322 unsigned int match_cnt = 0, annotated_cnt = 0, cur_match;
323 unsigned long seen_commits = 0;
324 unsigned int unannotated_cnt = 0;
325
326 cmit = lookup_commit_reference(the_repository, oid);
327
328 n = find_commit_name(&cmit->object.oid);
329 if (n && (tags || all || n->prio == 2)) {
330 /*
331 * Exact match to an existing ref.
332 */
333 append_name(n, dst);
334 if (n->misnamed || longformat)
335 append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst);
336 if (suffix)
337 strbuf_addstr(dst, suffix);
338 return;
339 }
340
341 if (!max_candidates)
342 die(_("no tag exactly matches '%s'"), oid_to_hex(&cmit->object.oid));
343 if (debug)
344 fprintf(stderr, _("No exact match on refs or tags, searching to describe\n"));
345
346 if (!have_util) {
347 struct hashmap_iter iter;
348 struct commit *c;
349 struct commit_name *n;
350
351 init_commit_names(&commit_names);
352 hashmap_for_each_entry(&names, &iter, n,
353 entry /* member name */) {
354 c = lookup_commit_reference_gently(the_repository,
355 &n->peeled, 1);
356 if (c)
357 *commit_names_at(&commit_names, c) = n;
358 }
359 have_util = 1;
360 }
361
362 list = NULL;
363 cmit->object.flags = SEEN;
364 commit_list_insert(cmit, &list);
365 while (list) {
366 struct commit *c = pop_commit(&list);
367 struct commit_list *parents = c->parents;
368 struct commit_name **slot;
369
370 seen_commits++;
371
372 if (match_cnt == max_candidates ||
373 match_cnt == hashmap_get_size(&names)) {
374 gave_up_on = c;
375 break;
376 }
377
378 slot = commit_names_peek(&commit_names, c);
379 n = slot ? *slot : NULL;
380 if (n) {
381 if (!tags && !all && n->prio < 2) {
382 unannotated_cnt++;
383 } else if (match_cnt < max_candidates) {
384 struct possible_tag *t = &all_matches[match_cnt++];
385 t->name = n;
386 t->depth = seen_commits - 1;
387 t->flag_within = 1u << match_cnt;
388 t->found_order = match_cnt;
389 c->object.flags |= t->flag_within;
390 if (n->prio == 2)
391 annotated_cnt++;
392 }
393 }
394 for (cur_match = 0; cur_match < match_cnt; cur_match++) {
395 struct possible_tag *t = &all_matches[cur_match];
396 if (!(c->object.flags & t->flag_within))
397 t->depth++;
398 }
399 /* Stop if last remaining path already covered by best candidate(s) */
400 if (annotated_cnt && !list) {
401 int best_depth = INT_MAX;
402 unsigned best_within = 0;
403 for (cur_match = 0; cur_match < match_cnt; cur_match++) {
404 struct possible_tag *t = &all_matches[cur_match];
405 if (t->depth < best_depth) {
406 best_depth = t->depth;
407 best_within = t->flag_within;
408 } else if (t->depth == best_depth) {
409 best_within |= t->flag_within;
410 }
411 }
412 if ((c->object.flags & best_within) == best_within) {
413 if (debug)
414 fprintf(stderr, _("finished search at %s\n"),
415 oid_to_hex(&c->object.oid));
416 break;
417 }
418 }
419 while (parents) {
420 struct commit *p = parents->item;
421 repo_parse_commit(the_repository, p);
422 if (!(p->object.flags & SEEN))
423 commit_list_insert_by_date(p, &list);
424 p->object.flags |= c->object.flags;
425 parents = parents->next;
426
427 if (first_parent)
428 break;
429 }
430 }
431
432 if (!match_cnt) {
433 struct object_id *cmit_oid = &cmit->object.oid;
434 if (always) {
435 strbuf_add_unique_abbrev(dst, cmit_oid, abbrev);
436 if (suffix)
437 strbuf_addstr(dst, suffix);
438 return;
439 }
440 if (unannotated_cnt)
441 die(_("No annotated tags can describe '%s'.\n"
442 "However, there were unannotated tags: try --tags."),
443 oid_to_hex(cmit_oid));
444 else
445 die(_("No tags can describe '%s'.\n"
446 "Try --always, or create some tags."),
447 oid_to_hex(cmit_oid));
448 }
449
450 QSORT(all_matches, match_cnt, compare_pt);
451
452 if (gave_up_on) {
453 commit_list_insert_by_date(gave_up_on, &list);
454 seen_commits--;
455 }
456 seen_commits += finish_depth_computation(&list, &all_matches[0]);
457 free_commit_list(list);
458
459 if (debug) {
460 static int label_width = -1;
461 if (label_width < 0) {
462 int i, w;
463 for (i = 0; i < ARRAY_SIZE(prio_names); i++) {
464 w = strlen(_(prio_names[i]));
465 if (label_width < w)
466 label_width = w;
467 }
468 }
469 for (cur_match = 0; cur_match < match_cnt; cur_match++) {
470 struct possible_tag *t = &all_matches[cur_match];
471 fprintf(stderr, " %-*s %8d %s\n",
472 label_width, _(prio_names[t->name->prio]),
473 t->depth, t->name->path);
474 }
475 fprintf(stderr, _("traversed %lu commits\n"), seen_commits);
476 if (gave_up_on) {
477 fprintf(stderr,
478 _("found %i tags; gave up search at %s\n"),
479 max_candidates,
480 oid_to_hex(&gave_up_on->object.oid));
481 }
482 }
483
484 append_name(all_matches[0].name, dst);
485 if (all_matches[0].name->misnamed || abbrev)
486 append_suffix(all_matches[0].depth, &cmit->object.oid, dst);
487 if (suffix)
488 strbuf_addstr(dst, suffix);
489}
490
491struct process_commit_data {
492 struct object_id current_commit;
493 struct object_id looking_for;
494 struct strbuf *dst;
495 struct rev_info *revs;
496};
497
498static void process_commit(struct commit *commit, void *data)
499{
500 struct process_commit_data *pcd = data;
501 pcd->current_commit = commit->object.oid;
502}
503
504static void process_object(struct object *obj, const char *path, void *data)
505{
506 struct process_commit_data *pcd = data;
507
508 if (oideq(&pcd->looking_for, &obj->oid) && !pcd->dst->len) {
509 reset_revision_walk();
510 describe_commit(&pcd->current_commit, pcd->dst);
511 strbuf_addf(pcd->dst, ":%s", path);
512 free_commit_list(pcd->revs->commits);
513 pcd->revs->commits = NULL;
514 }
515}
516
517static void describe_blob(struct object_id oid, struct strbuf *dst)
518{
519 struct rev_info revs;
520 struct strvec args = STRVEC_INIT;
521 struct process_commit_data pcd = { *null_oid(the_hash_algo), oid, dst, &revs};
522
523 strvec_pushl(&args, "internal: The first arg is not parsed",
524 "--objects", "--in-commit-order", "--reverse", "HEAD",
525 NULL);
526
527 repo_init_revisions(the_repository, &revs, NULL);
528 if (setup_revisions(args.nr, args.v, &revs, NULL) > 1)
529 BUG("setup_revisions could not handle all args?");
530
531 if (prepare_revision_walk(&revs))
532 die("revision walk setup failed");
533
534 traverse_commit_list(&revs, process_commit, process_object, &pcd);
535 reset_revision_walk();
536 release_revisions(&revs);
537 strvec_clear(&args);
538}
539
540static void describe(const char *arg, int last_one)
541{
542 struct object_id oid;
543 struct commit *cmit;
544 struct strbuf sb = STRBUF_INIT;
545
546 if (debug)
547 fprintf(stderr, _("describe %s\n"), arg);
548
549 if (repo_get_oid(the_repository, arg, &oid))
550 die(_("Not a valid object name %s"), arg);
551 cmit = lookup_commit_reference_gently(the_repository, &oid, 1);
552
553 if (cmit)
554 describe_commit(&oid, &sb);
555 else if (oid_object_info(the_repository, &oid, NULL) == OBJ_BLOB)
556 describe_blob(oid, &sb);
557 else
558 die(_("%s is neither a commit nor blob"), arg);
559
560 puts(sb.buf);
561
562 if (!last_one)
563 clear_commit_marks(cmit, -1);
564
565 strbuf_release(&sb);
566}
567
568static int option_parse_exact_match(const struct option *opt, const char *arg,
569 int unset)
570{
571 int *val = opt->value;
572
573 BUG_ON_OPT_ARG(arg);
574
575 *val = unset ? DEFAULT_CANDIDATES : 0;
576 return 0;
577}
578
579int cmd_describe(int argc,
580 const char **argv,
581 const char *prefix,
582 struct repository *repo UNUSED )
583{
584 int contains = 0;
585 struct option options[] = {
586 OPT_BOOL(0, "contains", &contains, N_("find the tag that comes after the commit")),
587 OPT_BOOL(0, "debug", &debug, N_("debug search strategy on stderr")),
588 OPT_BOOL(0, "all", &all, N_("use any ref")),
589 OPT_BOOL(0, "tags", &tags, N_("use any tag, even unannotated")),
590 OPT_BOOL(0, "long", &longformat, N_("always use long format")),
591 OPT_BOOL(0, "first-parent", &first_parent, N_("only follow first parent")),
592 OPT__ABBREV(&abbrev),
593 OPT_CALLBACK_F(0, "exact-match", &max_candidates, NULL,
594 N_("only output exact matches"),
595 PARSE_OPT_NOARG, option_parse_exact_match),
596 OPT_INTEGER(0, "candidates", &max_candidates,
597 N_("consider <n> most recent tags (default: 10)")),
598 OPT_STRING_LIST(0, "match", &patterns, N_("pattern"),
599 N_("only consider tags matching <pattern>")),
600 OPT_STRING_LIST(0, "exclude", &exclude_patterns, N_("pattern"),
601 N_("do not consider tags matching <pattern>")),
602 OPT_BOOL(0, "always", &always,
603 N_("show abbreviated commit object as fallback")),
604 {
605 .type = OPTION_STRING,
606 .long_name = "dirty",
607 .value = &dirty,
608 .argh = N_("mark"),
609 .help = N_("append <mark> on dirty working tree (default: \"-dirty\")"),
610 .flags = PARSE_OPT_OPTARG,
611 .defval = (intptr_t) "-dirty",
612 },
613 {
614 .type = OPTION_STRING,
615 .long_name = "broken",
616 .value = &broken,
617 .argh = N_("mark"),
618 .help = N_("append <mark> on broken working tree (default: \"-broken\")"),
619 .flags = PARSE_OPT_OPTARG,
620 .defval = (intptr_t) "-broken",
621 },
622 OPT_END(),
623 };
624
625 git_config(git_default_config, NULL);
626 argc = parse_options(argc, argv, prefix, options, describe_usage, 0);
627 if (abbrev < 0)
628 abbrev = DEFAULT_ABBREV;
629
630 if (max_candidates < 0)
631 max_candidates = 0;
632 else if (max_candidates > MAX_TAGS)
633 max_candidates = MAX_TAGS;
634
635 save_commit_buffer = 0;
636
637 if (longformat && abbrev == 0)
638 die(_("options '%s' and '%s' cannot be used together"), "--long", "--abbrev=0");
639
640 if (contains) {
641 struct string_list_item *item;
642 struct strvec args;
643 const char **argv_copy;
644 int ret;
645
646 strvec_init(&args);
647 strvec_pushl(&args, "name-rev",
648 "--peel-tag", "--name-only", "--no-undefined",
649 NULL);
650 if (always)
651 strvec_push(&args, "--always");
652 if (!all) {
653 strvec_push(&args, "--tags");
654 for_each_string_list_item(item, &patterns)
655 strvec_pushf(&args, "--refs=refs/tags/%s", item->string);
656 for_each_string_list_item(item, &exclude_patterns)
657 strvec_pushf(&args, "--exclude=refs/tags/%s", item->string);
658 }
659 if (argc)
660 strvec_pushv(&args, argv);
661 else
662 strvec_push(&args, "HEAD");
663
664 /*
665 * `cmd_name_rev()` modifies the array, so we'd leak its
666 * contained strings if we didn't do a copy here.
667 */
668 ALLOC_ARRAY(argv_copy, args.nr + 1);
669 for (size_t i = 0; i < args.nr; i++)
670 argv_copy[i] = args.v[i];
671 argv_copy[args.nr] = NULL;
672
673 ret = cmd_name_rev(args.nr, argv_copy, prefix, the_repository);
674
675 strvec_clear(&args);
676 free(argv_copy);
677 return ret;
678 }
679
680 hashmap_init(&names, commit_name_neq, NULL, 0);
681 refs_for_each_rawref(get_main_ref_store(the_repository), get_name,
682 NULL);
683 if (!hashmap_get_size(&names) && !always)
684 die(_("No names found, cannot describe anything."));
685
686 if (argc == 0) {
687 if (broken) {
688 struct child_process cp = CHILD_PROCESS_INIT;
689
690 strvec_pushv(&cp.args, update_index_args);
691 cp.git_cmd = 1;
692 cp.no_stdin = 1;
693 cp.no_stdout = 1;
694 run_command(&cp);
695
696 child_process_init(&cp);
697 strvec_pushv(&cp.args, diff_index_args);
698 cp.git_cmd = 1;
699 cp.no_stdin = 1;
700 cp.no_stdout = 1;
701
702 if (!dirty)
703 dirty = "-dirty";
704
705 switch (run_command(&cp)) {
706 case 0:
707 suffix = NULL;
708 break;
709 case 1:
710 suffix = dirty;
711 break;
712 default:
713 /* diff-index aborted abnormally */
714 suffix = broken;
715 }
716 } else if (dirty) {
717 struct lock_file index_lock = LOCK_INIT;
718 struct rev_info revs;
719 int fd;
720
721 setup_work_tree();
722 prepare_repo_settings(the_repository);
723 the_repository->settings.command_requires_full_index = 0;
724 repo_read_index(the_repository);
725 refresh_index(the_repository->index, REFRESH_QUIET|REFRESH_UNMERGED,
726 NULL, NULL, NULL);
727 fd = repo_hold_locked_index(the_repository,
728 &index_lock, 0);
729 if (0 <= fd)
730 repo_update_index_if_able(the_repository, &index_lock);
731
732 repo_init_revisions(the_repository, &revs, prefix);
733
734 if (setup_revisions(ARRAY_SIZE(diff_index_args) - 1,
735 diff_index_args, &revs, NULL) != 1)
736 BUG("malformed internal diff-index command line");
737 run_diff_index(&revs, 0);
738
739 if (!diff_result_code(&revs))
740 suffix = NULL;
741 else
742 suffix = dirty;
743 release_revisions(&revs);
744 }
745 describe("HEAD", 1);
746 } else if (dirty) {
747 die(_("option '%s' and commit-ishes cannot be used together"), "--dirty");
748 } else if (broken) {
749 die(_("option '%s' and commit-ishes cannot be used together"), "--broken");
750 } else {
751 while (argc-- > 0)
752 describe(*argv++, argc == 0);
753 }
754 return 0;
755}