]>
Commit | Line | Data |
---|---|---|
908e5310 | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
697cc8ef | 3 | #include "lockfile.h" |
908e5310 | 4 | #include "commit.h" |
635d4134 | 5 | #include "tag.h" |
644eb60b | 6 | #include "blob.h" |
908e5310 | 7 | #include "refs.h" |
9a0eaf83 | 8 | #include "builtin.h" |
23615708 | 9 | #include "exec_cmd.h" |
166185be | 10 | #include "parse-options.h" |
be26d2b2 | 11 | #include "revision.h" |
9f67d2e8 | 12 | #include "diff.h" |
29d8a834 | 13 | #include "hashmap.h" |
45bc950b | 14 | #include "argv-array.h" |
b0176ce6 | 15 | #include "run-command.h" |
644eb60b SB |
16 | #include "revision.h" |
17 | #include "list-objects.h" | |
908e5310 | 18 | |
8713ab30 SP |
19 | #define MAX_TAGS (FLAG_BITS - 1) |
20 | ||
166185be | 21 | static const char * const describe_usage[] = { |
9c9b4f2f AH |
22 | N_("git describe [<options>] [<commit-ish>...]"), |
23 | N_("git describe [<options>] --dirty"), | |
166185be PH |
24 | NULL |
25 | }; | |
908e5310 | 26 | |
8713ab30 | 27 | static int debug; /* Display lots of verbose info */ |
7e425c4f SP |
28 | static int all; /* Any valid ref can be used */ |
29 | static int tags; /* Allow lightweight tags */ | |
518120e3 | 30 | static int longformat; |
e00dd1e9 | 31 | static int first_parent; |
dce96489 | 32 | static int abbrev = -1; /* unspecified */ |
8713ab30 | 33 | static int max_candidates = 10; |
29d8a834 | 34 | static struct hashmap names; |
d1645d02 | 35 | static int have_util; |
43f8080e | 36 | static struct string_list patterns = STRING_LIST_INIT_NODUP; |
77d21f29 | 37 | static struct string_list exclude_patterns = STRING_LIST_INIT_NODUP; |
da2478db | 38 | static int always; |
b0176ce6 | 39 | static const char *suffix, *dirty, *broken; |
9f67d2e8 JP |
40 | |
41 | /* diff-index command arguments to check if working tree is dirty. */ | |
42 | static const char *diff_index_args[] = { | |
43 | "diff-index", "--quiet", "HEAD", "--", NULL | |
44 | }; | |
45 | ||
e7eb5034 | 46 | struct commit_name { |
29d8a834 | 47 | struct hashmap_entry entry; |
6439b5d9 | 48 | struct object_id peeled; |
212945d4 | 49 | struct tag *tag; |
03e8b541 SP |
50 | unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */ |
51 | unsigned name_checked:1; | |
6439b5d9 | 52 | struct object_id oid; |
219a0f33 | 53 | char *path; |
e7eb5034 | 54 | }; |
c4472643 | 55 | |
cf69fd49 | 56 | static const char *prio_names[] = { |
646c3bd1 | 57 | N_("head"), N_("lightweight"), N_("annotated"), |
cf69fd49 | 58 | }; |
908e5310 | 59 | |
7663cdc8 | 60 | static int commit_name_cmp(const void *unused_cmp_data, |
0068cede SB |
61 | const void *entry, |
62 | const void *entry_or_key, | |
7663cdc8 | 63 | const void *peeled) |
29d8a834 | 64 | { |
0068cede SB |
65 | const struct commit_name *cn1 = entry; |
66 | const struct commit_name *cn2 = entry_or_key; | |
67 | ||
6439b5d9 | 68 | return oidcmp(&cn1->peeled, peeled ? peeled : &cn2->peeled); |
29d8a834 KB |
69 | } |
70 | ||
6439b5d9 | 71 | static inline struct commit_name *find_commit_name(const struct object_id *peeled) |
3cfa4db3 | 72 | { |
6439b5d9 | 73 | return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled->hash); |
d1645d02 AK |
74 | } |
75 | ||
03e8b541 SP |
76 | static int replace_name(struct commit_name *e, |
77 | int prio, | |
6439b5d9 | 78 | const struct object_id *oid, |
03e8b541 SP |
79 | struct tag **tag) |
80 | { | |
81 | if (!e || e->prio < prio) | |
82 | return 1; | |
83 | ||
84 | if (e->prio == 2 && prio == 2) { | |
85 | /* Multiple annotated tags point to the same commit. | |
86 | * Select one to keep based upon their tagger date. | |
87 | */ | |
88 | struct tag *t; | |
89 | ||
90 | if (!e->tag) { | |
d3101b53 | 91 | t = lookup_tag(&e->oid); |
03e8b541 SP |
92 | if (!t || parse_tag(t)) |
93 | return 1; | |
94 | e->tag = t; | |
95 | } | |
96 | ||
d3101b53 | 97 | t = lookup_tag(oid); |
03e8b541 SP |
98 | if (!t || parse_tag(t)) |
99 | return 0; | |
100 | *tag = t; | |
101 | ||
102 | if (e->tag->date < t->date) | |
103 | return 1; | |
104 | } | |
105 | ||
106 | return 0; | |
107 | } | |
108 | ||
64deb858 | 109 | static void add_to_known_names(const char *path, |
6439b5d9 | 110 | const struct object_id *peeled, |
212945d4 | 111 | int prio, |
6439b5d9 | 112 | const struct object_id *oid) |
908e5310 | 113 | { |
3cfa4db3 | 114 | struct commit_name *e = find_commit_name(peeled); |
03e8b541 | 115 | struct tag *tag = NULL; |
6439b5d9 | 116 | if (replace_name(e, prio, oid, &tag)) { |
1e1ade18 AK |
117 | if (!e) { |
118 | e = xmalloc(sizeof(struct commit_name)); | |
6439b5d9 | 119 | oidcpy(&e->peeled, peeled); |
120 | hashmap_entry_init(e, sha1hash(peeled->hash)); | |
29d8a834 | 121 | hashmap_add(&names, e); |
219a0f33 | 122 | e->path = NULL; |
1e1ade18 | 123 | } |
03e8b541 | 124 | e->tag = tag; |
e7eb5034 | 125 | e->prio = prio; |
03e8b541 | 126 | e->name_checked = 0; |
6439b5d9 | 127 | oidcpy(&e->oid, oid); |
219a0f33 MH |
128 | free(e->path); |
129 | e->path = xstrdup(path); | |
908e5310 | 130 | } |
908e5310 LT |
131 | } |
132 | ||
99a2cfbf | 133 | static int get_name(const char *path, const struct object_id *oid, int flag, void *cb_data) |
908e5310 | 134 | { |
6d68b2ab | 135 | int is_tag = 0; |
99a2cfbf | 136 | struct object_id peeled; |
46e1d6eb | 137 | int is_annotated, prio; |
6d68b2ab MK |
138 | const char *path_to_match = NULL; |
139 | ||
140 | if (skip_prefix(path, "refs/tags/", &path_to_match)) { | |
141 | is_tag = 1; | |
142 | } else if (all) { | |
143 | if ((exclude_patterns.nr || patterns.nr) && | |
144 | !skip_prefix(path, "refs/heads/", &path_to_match) && | |
145 | !skip_prefix(path, "refs/remotes/", &path_to_match)) { | |
146 | /* Only accept reference of known type if there are match/exclude patterns */ | |
147 | return 0; | |
148 | } | |
149 | } else { | |
150 | /* Reject anything outside refs/tags/ unless --all */ | |
8a5a1884 | 151 | return 0; |
6d68b2ab | 152 | } |
8a5a1884 | 153 | |
77d21f29 JK |
154 | /* |
155 | * If we're given exclude patterns, first exclude any tag which match | |
156 | * any of the exclude pattern. | |
157 | */ | |
158 | if (exclude_patterns.nr) { | |
159 | struct string_list_item *item; | |
160 | ||
77d21f29 | 161 | for_each_string_list_item(item, &exclude_patterns) { |
6d68b2ab | 162 | if (!wildmatch(item->string, path_to_match, 0)) |
77d21f29 JK |
163 | return 0; |
164 | } | |
165 | } | |
166 | ||
43f8080e JK |
167 | /* |
168 | * If we're given patterns, accept only tags which match at least one | |
169 | * pattern. | |
170 | */ | |
171 | if (patterns.nr) { | |
da769d29 | 172 | int found = 0; |
43f8080e JK |
173 | struct string_list_item *item; |
174 | ||
43f8080e | 175 | for_each_string_list_item(item, &patterns) { |
6d68b2ab | 176 | if (!wildmatch(item->string, path_to_match, 0)) { |
da769d29 | 177 | found = 1; |
43f8080e | 178 | break; |
da769d29 MK |
179 | } |
180 | } | |
43f8080e | 181 | |
da769d29 | 182 | if (!found) |
43f8080e | 183 | return 0; |
43f8080e | 184 | } |
46e1d6eb JH |
185 | |
186 | /* Is it annotated? */ | |
b420d909 | 187 | if (!peel_ref(path, &peeled)) { |
99a2cfbf | 188 | is_annotated = !!oidcmp(oid, &peeled); |
feededd0 | 189 | } else { |
99a2cfbf | 190 | oidcpy(&peeled, oid); |
46e1d6eb | 191 | is_annotated = 0; |
feededd0 | 192 | } |
64deb858 | 193 | |
46e1d6eb JH |
194 | /* |
195 | * By default, we only use annotated tags, but with --tags | |
196 | * we fall back to lightweight ones (even without --tags, | |
197 | * we still remember lightweight ones, only to give hints | |
198 | * in an error message). --all allows any refs to be used. | |
2d9e7c9f | 199 | */ |
46e1d6eb JH |
200 | if (is_annotated) |
201 | prio = 2; | |
202 | else if (is_tag) | |
203 | prio = 1; | |
64deb858 JH |
204 | else |
205 | prio = 0; | |
206 | ||
6439b5d9 | 207 | add_to_known_names(all ? path + 5 : path + 10, &peeled, prio, oid); |
908e5310 LT |
208 | return 0; |
209 | } | |
210 | ||
80dbae03 | 211 | struct possible_tag { |
80dbae03 | 212 | struct commit_name *name; |
cf69fd49 SP |
213 | int depth; |
214 | int found_order; | |
8713ab30 | 215 | unsigned flag_within; |
80dbae03 SP |
216 | }; |
217 | ||
cf69fd49 SP |
218 | static int compare_pt(const void *a_, const void *b_) |
219 | { | |
220 | struct possible_tag *a = (struct possible_tag *)a_; | |
221 | struct possible_tag *b = (struct possible_tag *)b_; | |
cf69fd49 SP |
222 | if (a->depth != b->depth) |
223 | return a->depth - b->depth; | |
224 | if (a->found_order != b->found_order) | |
225 | return a->found_order - b->found_order; | |
226 | return 0; | |
227 | } | |
228 | ||
1b600e65 SP |
229 | static unsigned long finish_depth_computation( |
230 | struct commit_list **list, | |
231 | struct possible_tag *best) | |
232 | { | |
233 | unsigned long seen_commits = 0; | |
234 | while (*list) { | |
235 | struct commit *c = pop_commit(list); | |
236 | struct commit_list *parents = c->parents; | |
237 | seen_commits++; | |
238 | if (c->object.flags & best->flag_within) { | |
239 | struct commit_list *a = *list; | |
240 | while (a) { | |
241 | struct commit *i = a->item; | |
242 | if (!(i->object.flags & best->flag_within)) | |
243 | break; | |
244 | a = a->next; | |
245 | } | |
246 | if (!a) | |
247 | break; | |
248 | } else | |
249 | best->depth++; | |
250 | while (parents) { | |
251 | struct commit *p = parents->item; | |
252 | parse_commit(p); | |
253 | if (!(p->object.flags & SEEN)) | |
47e44ed1 | 254 | commit_list_insert_by_date(p, list); |
1b600e65 SP |
255 | p->object.flags |= c->object.flags; |
256 | parents = parents->next; | |
257 | } | |
258 | } | |
259 | return seen_commits; | |
260 | } | |
261 | ||
4dbc59a4 | 262 | static void append_name(struct commit_name *n, struct strbuf *dst) |
212945d4 SP |
263 | { |
264 | if (n->prio == 2 && !n->tag) { | |
d3101b53 | 265 | n->tag = lookup_tag(&n->oid); |
03e8b541 | 266 | if (!n->tag || parse_tag(n->tag)) |
e41f1cb3 | 267 | die(_("annotated tag %s not available"), n->path); |
03e8b541 SP |
268 | } |
269 | if (n->tag && !n->name_checked) { | |
270 | if (!n->tag->tag) | |
e41f1cb3 | 271 | die(_("annotated tag %s has no embedded name"), n->path); |
81dc223d | 272 | if (strcmp(n->tag->tag, all ? n->path + 5 : n->path)) |
e41f1cb3 | 273 | warning(_("tag '%s' is really '%s' here"), n->tag->tag, n->path); |
03e8b541 | 274 | n->name_checked = 1; |
212945d4 SP |
275 | } |
276 | ||
1bba0013 DKF |
277 | if (n->tag) { |
278 | if (all) | |
fac64e01 | 279 | strbuf_addstr(dst, "tags/"); |
4dbc59a4 | 280 | strbuf_addstr(dst, n->tag->tag); |
1bba0013 | 281 | } else { |
4dbc59a4 | 282 | strbuf_addstr(dst, n->path); |
1bba0013 | 283 | } |
870cf7d6 JH |
284 | } |
285 | ||
4dbc59a4 | 286 | static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst) |
870cf7d6 | 287 | { |
4dbc59a4 | 288 | strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid->hash, abbrev)); |
212945d4 SP |
289 | } |
290 | ||
4dbc59a4 | 291 | static void describe_commit(struct object_id *oid, struct strbuf *dst) |
908e5310 | 292 | { |
8713ab30 | 293 | struct commit *cmit, *gave_up_on = NULL; |
908e5310 | 294 | struct commit_list *list; |
908e5310 | 295 | struct commit_name *n; |
cf69fd49 | 296 | struct possible_tag all_matches[MAX_TAGS]; |
8713ab30 SP |
297 | unsigned int match_cnt = 0, annotated_cnt = 0, cur_match; |
298 | unsigned long seen_commits = 0; | |
4d23660e | 299 | unsigned int unannotated_cnt = 0; |
908e5310 | 300 | |
4dbc59a4 | 301 | cmit = lookup_commit_reference(oid); |
4c34a2c5 | 302 | |
6439b5d9 | 303 | n = find_commit_name(&cmit->object.oid); |
7a0d61bb | 304 | if (n && (tags || all || n->prio == 2)) { |
870cf7d6 JH |
305 | /* |
306 | * Exact match to an existing ref. | |
307 | */ | |
4dbc59a4 | 308 | append_name(n, dst); |
870cf7d6 | 309 | if (longformat) |
4dbc59a4 | 310 | append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst); |
b0176ce6 | 311 | if (suffix) |
4dbc59a4 | 312 | strbuf_addstr(dst, suffix); |
908e5310 LT |
313 | return; |
314 | } | |
315 | ||
2c33f757 | 316 | if (!max_candidates) |
f2fd0760 | 317 | die(_("no tag exactly matches '%s'"), oid_to_hex(&cmit->object.oid)); |
8713ab30 | 318 | if (debug) |
cdaed0cf | 319 | fprintf(stderr, _("No exact match on refs or tags, searching to describe\n")); |
8713ab30 | 320 | |
d1645d02 | 321 | if (!have_util) { |
29d8a834 KB |
322 | struct hashmap_iter iter; |
323 | struct commit *c; | |
324 | struct commit_name *n = hashmap_iter_first(&names, &iter); | |
325 | for (; n; n = hashmap_iter_next(&iter)) { | |
bc83266a | 326 | c = lookup_commit_reference_gently(&n->peeled, 1); |
29d8a834 KB |
327 | if (c) |
328 | c->util = n; | |
329 | } | |
d1645d02 AK |
330 | have_util = 1; |
331 | } | |
332 | ||
908e5310 | 333 | list = NULL; |
8713ab30 | 334 | cmit->object.flags = SEEN; |
908e5310 LT |
335 | commit_list_insert(cmit, &list); |
336 | while (list) { | |
80dbae03 | 337 | struct commit *c = pop_commit(&list); |
dccd0c2a | 338 | struct commit_list *parents = c->parents; |
8713ab30 | 339 | seen_commits++; |
e7eb5034 | 340 | n = c->util; |
908e5310 | 341 | if (n) { |
4d23660e TR |
342 | if (!tags && !all && n->prio < 2) { |
343 | unannotated_cnt++; | |
344 | } else if (match_cnt < max_candidates) { | |
8713ab30 SP |
345 | struct possible_tag *t = &all_matches[match_cnt++]; |
346 | t->name = n; | |
347 | t->depth = seen_commits - 1; | |
348 | t->flag_within = 1u << match_cnt; | |
8a8169c0 | 349 | t->found_order = match_cnt; |
8713ab30 SP |
350 | c->object.flags |= t->flag_within; |
351 | if (n->prio == 2) | |
352 | annotated_cnt++; | |
353 | } | |
354 | else { | |
355 | gave_up_on = c; | |
356 | break; | |
357 | } | |
358 | } | |
359 | for (cur_match = 0; cur_match < match_cnt; cur_match++) { | |
360 | struct possible_tag *t = &all_matches[cur_match]; | |
361 | if (!(c->object.flags & t->flag_within)) | |
362 | t->depth++; | |
363 | } | |
364 | if (annotated_cnt && !list) { | |
365 | if (debug) | |
e41f1cb3 | 366 | fprintf(stderr, _("finished search at %s\n"), |
f2fd0760 | 367 | oid_to_hex(&c->object.oid)); |
8713ab30 | 368 | break; |
dccd0c2a SP |
369 | } |
370 | while (parents) { | |
371 | struct commit *p = parents->item; | |
372 | parse_commit(p); | |
8713ab30 | 373 | if (!(p->object.flags & SEEN)) |
47e44ed1 | 374 | commit_list_insert_by_date(p, &list); |
8713ab30 | 375 | p->object.flags |= c->object.flags; |
dccd0c2a | 376 | parents = parents->next; |
e00dd1e9 MC |
377 | |
378 | if (first_parent) | |
379 | break; | |
80dbae03 SP |
380 | } |
381 | } | |
382 | ||
da2478db | 383 | if (!match_cnt) { |
c87b653c | 384 | struct object_id *cmit_oid = &cmit->object.oid; |
da2478db | 385 | if (always) { |
fbac558a | 386 | strbuf_add_unique_abbrev(dst, cmit_oid->hash, abbrev); |
b0176ce6 | 387 | if (suffix) |
4dbc59a4 | 388 | strbuf_addstr(dst, suffix); |
da2478db JH |
389 | return; |
390 | } | |
4d23660e | 391 | if (unannotated_cnt) |
e41f1cb3 ÆAB |
392 | die(_("No annotated tags can describe '%s'.\n" |
393 | "However, there were unannotated tags: try --tags."), | |
c87b653c | 394 | oid_to_hex(cmit_oid)); |
4d23660e | 395 | else |
e41f1cb3 ÆAB |
396 | die(_("No tags can describe '%s'.\n" |
397 | "Try --always, or create some tags."), | |
c87b653c | 398 | oid_to_hex(cmit_oid)); |
da2478db | 399 | } |
80dbae03 | 400 | |
9ed0d8d6 | 401 | QSORT(all_matches, match_cnt, compare_pt); |
1b600e65 SP |
402 | |
403 | if (gave_up_on) { | |
47e44ed1 | 404 | commit_list_insert_by_date(gave_up_on, &list); |
1b600e65 SP |
405 | seen_commits--; |
406 | } | |
407 | seen_commits += finish_depth_computation(&list, &all_matches[0]); | |
408 | free_commit_list(list); | |
409 | ||
8713ab30 | 410 | if (debug) { |
646c3bd1 MG |
411 | static int label_width = -1; |
412 | if (label_width < 0) { | |
413 | int i, w; | |
414 | for (i = 0; i < ARRAY_SIZE(prio_names); i++) { | |
415 | w = strlen(_(prio_names[i])); | |
416 | if (label_width < w) | |
417 | label_width = w; | |
418 | } | |
419 | } | |
8713ab30 SP |
420 | for (cur_match = 0; cur_match < match_cnt; cur_match++) { |
421 | struct possible_tag *t = &all_matches[cur_match]; | |
646c3bd1 MG |
422 | fprintf(stderr, " %-*s %8d %s\n", |
423 | label_width, _(prio_names[t->name->prio]), | |
8713ab30 SP |
424 | t->depth, t->name->path); |
425 | } | |
e41f1cb3 | 426 | fprintf(stderr, _("traversed %lu commits\n"), seen_commits); |
8713ab30 SP |
427 | if (gave_up_on) { |
428 | fprintf(stderr, | |
e41f1cb3 ÆAB |
429 | _("more than %i tags found; listed %i most recent\n" |
430 | "gave up search at %s\n"), | |
8713ab30 | 431 | max_candidates, max_candidates, |
f2fd0760 | 432 | oid_to_hex(&gave_up_on->object.oid)); |
8713ab30 | 433 | } |
80dbae03 | 434 | } |
212945d4 | 435 | |
4dbc59a4 | 436 | append_name(all_matches[0].name, dst); |
212945d4 | 437 | if (abbrev) |
4dbc59a4 | 438 | append_suffix(all_matches[0].depth, &cmit->object.oid, dst); |
b0176ce6 | 439 | if (suffix) |
4dbc59a4 SB |
440 | strbuf_addstr(dst, suffix); |
441 | } | |
442 | ||
644eb60b SB |
443 | struct process_commit_data { |
444 | struct object_id current_commit; | |
445 | struct object_id looking_for; | |
446 | struct strbuf *dst; | |
447 | struct rev_info *revs; | |
448 | }; | |
449 | ||
450 | static void process_commit(struct commit *commit, void *data) | |
451 | { | |
452 | struct process_commit_data *pcd = data; | |
453 | pcd->current_commit = commit->object.oid; | |
454 | } | |
455 | ||
456 | static void process_object(struct object *obj, const char *path, void *data) | |
457 | { | |
458 | struct process_commit_data *pcd = data; | |
459 | ||
460 | if (!oidcmp(&pcd->looking_for, &obj->oid) && !pcd->dst->len) { | |
461 | reset_revision_walk(); | |
462 | describe_commit(&pcd->current_commit, pcd->dst); | |
463 | strbuf_addf(pcd->dst, ":%s", path); | |
464 | free_commit_list(pcd->revs->commits); | |
465 | pcd->revs->commits = NULL; | |
466 | } | |
467 | } | |
468 | ||
469 | static void describe_blob(struct object_id oid, struct strbuf *dst) | |
470 | { | |
471 | struct rev_info revs; | |
472 | struct argv_array args = ARGV_ARRAY_INIT; | |
473 | struct process_commit_data pcd = { null_oid, oid, dst, &revs}; | |
474 | ||
475 | argv_array_pushl(&args, "internal: The first arg is not parsed", | |
476 | "--objects", "--in-commit-order", "--reverse", "HEAD", | |
477 | NULL); | |
478 | ||
479 | init_revisions(&revs, NULL); | |
480 | if (setup_revisions(args.argc, args.argv, &revs, NULL) > 1) | |
481 | BUG("setup_revisions could not handle all args?"); | |
482 | ||
483 | if (prepare_revision_walk(&revs)) | |
484 | die("revision walk setup failed"); | |
485 | ||
486 | traverse_commit_list(&revs, process_commit, process_object, &pcd); | |
487 | reset_revision_walk(); | |
488 | } | |
489 | ||
4dbc59a4 SB |
490 | static void describe(const char *arg, int last_one) |
491 | { | |
492 | struct object_id oid; | |
493 | struct commit *cmit; | |
494 | struct strbuf sb = STRBUF_INIT; | |
495 | ||
496 | if (debug) | |
497 | fprintf(stderr, _("describe %s\n"), arg); | |
498 | ||
499 | if (get_oid(arg, &oid)) | |
500 | die(_("Not a valid object name %s"), arg); | |
644eb60b | 501 | cmit = lookup_commit_reference_gently(&oid, 1); |
4dbc59a4 | 502 | |
644eb60b SB |
503 | if (cmit) |
504 | describe_commit(&oid, &sb); | |
505 | else if (lookup_blob(&oid)) | |
506 | describe_blob(oid, &sb); | |
507 | else | |
508 | die(_("%s is neither a commit nor blob"), arg); | |
4dbc59a4 SB |
509 | |
510 | puts(sb.buf); | |
80dbae03 | 511 | |
8713ab30 SP |
512 | if (!last_one) |
513 | clear_commit_marks(cmit, -1); | |
4dbc59a4 SB |
514 | |
515 | strbuf_release(&sb); | |
908e5310 LT |
516 | } |
517 | ||
9a0eaf83 | 518 | int cmd_describe(int argc, const char **argv, const char *prefix) |
908e5310 | 519 | { |
23615708 | 520 | int contains = 0; |
166185be | 521 | struct option options[] = { |
d5d09d47 SB |
522 | OPT_BOOL(0, "contains", &contains, N_("find the tag that comes after the commit")), |
523 | OPT_BOOL(0, "debug", &debug, N_("debug search strategy on stderr")), | |
524 | OPT_BOOL(0, "all", &all, N_("use any ref")), | |
525 | OPT_BOOL(0, "tags", &tags, N_("use any tag, even unannotated")), | |
526 | OPT_BOOL(0, "long", &longformat, N_("always use long format")), | |
527 | OPT_BOOL(0, "first-parent", &first_parent, N_("only follow first parent")), | |
166185be | 528 | OPT__ABBREV(&abbrev), |
2c33f757 | 529 | OPT_SET_INT(0, "exact-match", &max_candidates, |
bfb0737d | 530 | N_("only output exact matches"), 0), |
166185be | 531 | OPT_INTEGER(0, "candidates", &max_candidates, |
bfb0737d | 532 | N_("consider <n> most recent tags (default: 10)")), |
43f8080e | 533 | OPT_STRING_LIST(0, "match", &patterns, N_("pattern"), |
bfb0737d | 534 | N_("only consider tags matching <pattern>")), |
77d21f29 JK |
535 | OPT_STRING_LIST(0, "exclude", &exclude_patterns, N_("pattern"), |
536 | N_("do not consider tags matching <pattern>")), | |
d5d09d47 SB |
537 | OPT_BOOL(0, "always", &always, |
538 | N_("show abbreviated commit object as fallback")), | |
bfb0737d | 539 | {OPTION_STRING, 0, "dirty", &dirty, N_("mark"), |
d5d09d47 SB |
540 | N_("append <mark> on dirty working tree (default: \"-dirty\")"), |
541 | PARSE_OPT_OPTARG, NULL, (intptr_t) "-dirty"}, | |
b0176ce6 SB |
542 | {OPTION_STRING, 0, "broken", &broken, N_("mark"), |
543 | N_("append <mark> on broken working tree (default: \"-broken\")"), | |
544 | PARSE_OPT_OPTARG, NULL, (intptr_t) "-broken"}, | |
166185be PH |
545 | OPT_END(), |
546 | }; | |
908e5310 | 547 | |
dce96489 | 548 | git_config(git_default_config, NULL); |
37782920 | 549 | argc = parse_options(argc, argv, prefix, options, describe_usage, 0); |
dce96489 LT |
550 | if (abbrev < 0) |
551 | abbrev = DEFAULT_ABBREV; | |
552 | ||
2c33f757 SP |
553 | if (max_candidates < 0) |
554 | max_candidates = 0; | |
166185be PH |
555 | else if (max_candidates > MAX_TAGS) |
556 | max_candidates = MAX_TAGS; | |
4c34a2c5 | 557 | |
8c599c74 | 558 | save_commit_buffer = 0; |
8112894d | 559 | |
518120e3 | 560 | if (longformat && abbrev == 0) |
e41f1cb3 | 561 | die(_("--long is incompatible with --abbrev=0")); |
518120e3 | 562 | |
23615708 | 563 | if (contains) { |
43f8080e | 564 | struct string_list_item *item; |
45bc950b JH |
565 | struct argv_array args; |
566 | ||
567 | argv_array_init(&args); | |
adfc1857 JH |
568 | argv_array_pushl(&args, "name-rev", |
569 | "--peel-tag", "--name-only", "--no-undefined", | |
45bc950b | 570 | NULL); |
da2478db | 571 | if (always) |
45bc950b | 572 | argv_array_push(&args, "--always"); |
30ffa603 | 573 | if (!all) { |
45bc950b | 574 | argv_array_push(&args, "--tags"); |
43f8080e JK |
575 | for_each_string_list_item(item, &patterns) |
576 | argv_array_pushf(&args, "--refs=refs/tags/%s", item->string); | |
77d21f29 JK |
577 | for_each_string_list_item(item, &exclude_patterns) |
578 | argv_array_pushf(&args, "--exclude=refs/tags/%s", item->string); | |
45bc950b | 579 | } |
2bd07065 SG |
580 | if (argc) |
581 | argv_array_pushv(&args, argv); | |
582 | else | |
583 | argv_array_push(&args, "HEAD"); | |
45bc950b | 584 | return cmd_name_rev(args.argc, args.argv, prefix); |
23615708 SP |
585 | } |
586 | ||
0068cede | 587 | hashmap_init(&names, commit_name_cmp, NULL, 0); |
99a2cfbf | 588 | for_each_rawref(get_name, NULL); |
8b604d19 | 589 | if (!hashmap_get_size(&names) && !always) |
e41f1cb3 | 590 | die(_("No names found, cannot describe anything.")); |
fb423da0 | 591 | |
166185be | 592 | if (argc == 0) { |
b0176ce6 SB |
593 | if (broken) { |
594 | struct child_process cp = CHILD_PROCESS_INIT; | |
595 | argv_array_pushv(&cp.args, diff_index_args); | |
596 | cp.git_cmd = 1; | |
597 | cp.no_stdin = 1; | |
598 | cp.no_stdout = 1; | |
599 | ||
600 | if (!dirty) | |
601 | dirty = "-dirty"; | |
602 | ||
603 | switch (run_command(&cp)) { | |
604 | case 0: | |
605 | suffix = NULL; | |
606 | break; | |
607 | case 1: | |
608 | suffix = dirty; | |
609 | break; | |
610 | default: | |
611 | /* diff-index aborted abnormally */ | |
612 | suffix = broken; | |
613 | } | |
614 | } else if (dirty) { | |
bb571486 | 615 | static struct lock_file index_lock; |
be26d2b2 JH |
616 | struct rev_info revs; |
617 | struct argv_array args = ARGV_ARRAY_INIT; | |
618 | int fd, result; | |
bb571486 AC |
619 | |
620 | read_cache_preload(NULL); | |
621 | refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, | |
622 | NULL, NULL, NULL); | |
623 | fd = hold_locked_index(&index_lock, 0); | |
624 | if (0 <= fd) | |
625 | update_index_if_able(&the_index, &index_lock); | |
626 | ||
be26d2b2 JH |
627 | init_revisions(&revs, prefix); |
628 | argv_array_pushv(&args, diff_index_args); | |
629 | if (setup_revisions(args.argc, args.argv, &revs, NULL) != 1) | |
630 | BUG("malformed internal diff-index command line"); | |
631 | result = run_diff_index(&revs, 0); | |
632 | ||
633 | if (!diff_result_code(&revs.diffopt, result)) | |
b0176ce6 SB |
634 | suffix = NULL; |
635 | else | |
636 | suffix = dirty; | |
bb571486 | 637 | } |
fec9ebf1 | 638 | describe("HEAD", 1); |
9f67d2e8 | 639 | } else if (dirty) { |
a8a5406a | 640 | die(_("--dirty is incompatible with commit-ishes")); |
b0176ce6 SB |
641 | } else if (broken) { |
642 | die(_("--broken is incompatible with commit-ishes")); | |
166185be | 643 | } else { |
c4472643 | 644 | while (argc-- > 0) |
166185be | 645 | describe(*argv++, argc == 0); |
166185be | 646 | } |
908e5310 LT |
647 | return 0; |
648 | } |