]> git.ipfire.org Git - thirdparty/git.git/blame - sha1-name.c
The sixth batch for 2.26
[thirdparty/git.git] / sha1-name.c
CommitLineData
9938af6a 1#include "cache.h"
b2141fc1 2#include "config.h"
5385f52d 3#include "tag.h"
9938af6a 4#include "commit.h"
5385f52d
JH
5#include "tree.h"
6#include "blob.h"
f3ab49db 7#include "tree-walk.h"
d556fae2 8#include "refs.h"
28fb8438 9#include "remote.h"
dbe44faa 10#include "dir.h"
fad6b9e5 11#include "sha1-array.h"
0317f455 12#include "packfile.h"
0d4a1321 13#include "object-store.h"
031dc927 14#include "repository.h"
efe461b0 15#include "submodule.h"
8aac67a1 16#include "midx.h"
64043556 17#include "commit-reach.h"
9938af6a 18
0bb41a19 19static int get_oid_oneline(struct repository *r, const char *, struct object_id *, struct commit_list *);
32574b68 20
ef9b0370 21typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *);
a78fafe7
JH
22
23struct disambiguate_state {
0016043b 24 int len; /* length of prefix in hex chars */
dc01505f 25 char hex_pfx[GIT_MAX_HEXSZ + 1];
d2ee1185 26 struct object_id bin_pfx;
0016043b 27
ef9b0370 28 struct repository *repo;
a78fafe7
JH
29 disambiguate_hint_fn fn;
30 void *cb_data;
d2ee1185 31 struct object_id candidate;
a78fafe7
JH
32 unsigned candidate_exists:1;
33 unsigned candidate_checked:1;
34 unsigned candidate_ok:1;
35 unsigned disambiguate_fn_used:1;
36 unsigned ambiguous:1;
957d7406 37 unsigned always_call_fn:1;
a78fafe7
JH
38};
39
d2b7d9c7 40static void update_candidates(struct disambiguate_state *ds, const struct object_id *current)
a78fafe7 41{
957d7406 42 if (ds->always_call_fn) {
ef9b0370 43 ds->ambiguous = ds->fn(ds->repo, current, ds->cb_data) ? 1 : 0;
957d7406
JH
44 return;
45 }
a78fafe7
JH
46 if (!ds->candidate_exists) {
47 /* this is the first candidate */
d2b7d9c7 48 oidcpy(&ds->candidate, current);
a78fafe7
JH
49 ds->candidate_exists = 1;
50 return;
4a7e27e9 51 } else if (oideq(&ds->candidate, current)) {
a78fafe7
JH
52 /* the same as what we already have seen */
53 return;
54 }
55
56 if (!ds->fn) {
57 /* cannot disambiguate between ds->candidate and current */
58 ds->ambiguous = 1;
59 return;
60 }
61
62 if (!ds->candidate_checked) {
ef9b0370 63 ds->candidate_ok = ds->fn(ds->repo, &ds->candidate, ds->cb_data);
a78fafe7
JH
64 ds->disambiguate_fn_used = 1;
65 ds->candidate_checked = 1;
66 }
67
68 if (!ds->candidate_ok) {
749f763d 69 /* discard the candidate; we know it does not satisfy fn */
d2b7d9c7 70 oidcpy(&ds->candidate, current);
a78fafe7
JH
71 ds->candidate_checked = 0;
72 return;
73 }
74
75 /* if we reach this point, we know ds->candidate satisfies fn */
ef9b0370 76 if (ds->fn(ds->repo, current, ds->cb_data)) {
a78fafe7
JH
77 /*
78 * if both current and candidate satisfy fn, we cannot
79 * disambiguate.
80 */
81 ds->candidate_ok = 0;
82 ds->ambiguous = 1;
83 }
84
85 /* otherwise, current can be discarded and candidate is still good */
86}
87
cc817ca3
RS
88static int match_sha(unsigned, const unsigned char *, const unsigned char *);
89
0016043b 90static void find_short_object_filename(struct disambiguate_state *ds)
9938af6a 91{
263db403 92 struct object_directory *odb;
99a19b43 93
ef9b0370 94 for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next) {
cc817ca3 95 int pos;
0000d654 96 struct oid_array *loose_objects;
cc817ca3 97
0000d654
RS
98 loose_objects = odb_loose_cache(odb, &ds->bin_pfx);
99 pos = oid_array_lookup(loose_objects, &ds->bin_pfx);
cc817ca3
RS
100 if (pos < 0)
101 pos = -1 - pos;
0000d654 102 while (!ds->ambiguous && pos < loose_objects->nr) {
cc817ca3 103 const struct object_id *oid;
0000d654 104 oid = loose_objects->oid + pos;
cc817ca3
RS
105 if (!match_sha(ds->len, ds->bin_pfx.hash, oid->hash))
106 break;
107 update_candidates(ds, oid);
108 pos++;
9938af6a 109 }
9938af6a 110 }
9938af6a
JH
111}
112
113static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
114{
115 do {
116 if (*a != *b)
117 return 0;
118 a++;
119 b++;
120 len -= 2;
121 } while (len > 1);
122 if (len)
123 if ((*a ^ *b) & 0xf0)
124 return 0;
125 return 1;
126}
127
8aac67a1
DS
128static void unique_in_midx(struct multi_pack_index *m,
129 struct disambiguate_state *ds)
130{
131 uint32_t num, i, first = 0;
132 const struct object_id *current = NULL;
133 num = m->num_objects;
134
135 if (!num)
136 return;
137
138 bsearch_midx(&ds->bin_pfx, m, &first);
139
140 /*
141 * At this point, "first" is the location of the lowest object
142 * with an object name that could match "bin_pfx". See if we have
143 * 0, 1 or more objects that actually match(es).
144 */
145 for (i = first; i < num && !ds->ambiguous; i++) {
146 struct object_id oid;
147 current = nth_midxed_object_oid(&oid, m, i);
148 if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))
149 break;
150 update_candidates(ds, current);
151 }
152}
153
0016043b 154static void unique_in_pack(struct packed_git *p,
a78fafe7 155 struct disambiguate_state *ds)
9938af6a 156{
902f5a21 157 uint32_t num, i, first = 0;
d2b7d9c7 158 const struct object_id *current = NULL;
f703e6ea 159
af96fe33
DS
160 if (p->multi_pack_index)
161 return;
162
0e87b856
DS
163 if (open_pack_index(p) || !p->num_objects)
164 return;
165
f703e6ea 166 num = p->num_objects;
902f5a21 167 bsearch_pack(&ds->bin_pfx, p, &first);
f703e6ea
JH
168
169 /*
170 * At this point, "first" is the location of the lowest object
1703f9aa 171 * with an object name that could match "bin_pfx". See if we have
f703e6ea
JH
172 * 0, 1 or more objects that actually match(es).
173 */
a78fafe7 174 for (i = first; i < num && !ds->ambiguous; i++) {
d2b7d9c7 175 struct object_id oid;
176 current = nth_packed_object_oid(&oid, p, i);
177 if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))
f703e6ea 178 break;
a78fafe7 179 update_candidates(ds, current);
9938af6a 180 }
f703e6ea
JH
181}
182
0016043b 183static void find_short_packed_object(struct disambiguate_state *ds)
9938af6a 184{
8aac67a1 185 struct multi_pack_index *m;
9938af6a
JH
186 struct packed_git *p;
187
ef9b0370 188 for (m = get_multi_pack_index(ds->repo); m && !ds->ambiguous;
8aac67a1
DS
189 m = m->next)
190 unique_in_midx(m, ds);
ef9b0370 191 for (p = get_packed_git(ds->repo); p && !ds->ambiguous;
a80d72db 192 p = p->next)
0016043b 193 unique_in_pack(p, ds);
99a19b43
JH
194}
195
a78fafe7 196static int finish_object_disambiguation(struct disambiguate_state *ds,
e82caf38 197 struct object_id *oid)
99a19b43 198{
a78fafe7
JH
199 if (ds->ambiguous)
200 return SHORT_NAME_AMBIGUOUS;
99a19b43 201
a78fafe7 202 if (!ds->candidate_exists)
d1dd94b3 203 return MISSING_OBJECT;
a78fafe7
JH
204
205 if (!ds->candidate_checked)
206 /*
207 * If this is the only candidate, there is no point
208 * calling the disambiguation hint callback.
209 *
210 * On the other hand, if the current candidate
211 * replaced an earlier candidate that did _not_ pass
212 * the disambiguation hint callback, then we do have
213 * more than one objects that match the short name
214 * given, so we should make sure this one matches;
215 * otherwise, if we discovered this one and the one
216 * that we previously discarded in the reverse order,
217 * we would end up showing different results in the
218 * same repository!
219 */
220 ds->candidate_ok = (!ds->disambiguate_fn_used ||
ef9b0370 221 ds->fn(ds->repo, &ds->candidate, ds->cb_data));
a78fafe7
JH
222
223 if (!ds->candidate_ok)
013f276e 224 return SHORT_NAME_AMBIGUOUS;
a78fafe7 225
e82caf38 226 oidcpy(oid, &ds->candidate);
9938af6a
JH
227 return 0;
228}
229
ef9b0370
NTND
230static int disambiguate_commit_only(struct repository *r,
231 const struct object_id *oid,
232 void *cb_data_unused)
aa1dec9e 233{
ef9b0370 234 int kind = oid_object_info(r, oid, NULL);
aa1dec9e
JH
235 return kind == OBJ_COMMIT;
236}
237
ef9b0370
NTND
238static int disambiguate_committish_only(struct repository *r,
239 const struct object_id *oid,
240 void *cb_data_unused)
e2643617
JH
241{
242 struct object *obj;
243 int kind;
244
ef9b0370 245 kind = oid_object_info(r, oid, NULL);
e2643617
JH
246 if (kind == OBJ_COMMIT)
247 return 1;
248 if (kind != OBJ_TAG)
99a19b43 249 return 0;
e2643617
JH
250
251 /* We need to do this the hard way... */
ef9b0370 252 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
e2643617
JH
253 if (obj && obj->type == OBJ_COMMIT)
254 return 1;
9938af6a
JH
255 return 0;
256}
257
ef9b0370
NTND
258static int disambiguate_tree_only(struct repository *r,
259 const struct object_id *oid,
260 void *cb_data_unused)
9938af6a 261{
ef9b0370 262 int kind = oid_object_info(r, oid, NULL);
daba53ae
JH
263 return kind == OBJ_TREE;
264}
9938af6a 265
ef9b0370
NTND
266static int disambiguate_treeish_only(struct repository *r,
267 const struct object_id *oid,
268 void *cb_data_unused)
daba53ae
JH
269{
270 struct object *obj;
271 int kind;
272
ef9b0370 273 kind = oid_object_info(r, oid, NULL);
daba53ae
JH
274 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
275 return 1;
276 if (kind != OBJ_TAG)
277 return 0;
278
279 /* We need to do this the hard way... */
ef9b0370 280 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
daba53ae
JH
281 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
282 return 1;
283 return 0;
284}
285
ef9b0370
NTND
286static int disambiguate_blob_only(struct repository *r,
287 const struct object_id *oid,
288 void *cb_data_unused)
daba53ae 289{
ef9b0370 290 int kind = oid_object_info(r, oid, NULL);
daba53ae
JH
291 return kind == OBJ_BLOB;
292}
293
5b33cb1f
JK
294static disambiguate_hint_fn default_disambiguate_hint;
295
296int set_disambiguate_hint_config(const char *var, const char *value)
297{
298 static const struct {
299 const char *name;
300 disambiguate_hint_fn fn;
301 } hints[] = {
302 { "none", NULL },
303 { "commit", disambiguate_commit_only },
304 { "committish", disambiguate_committish_only },
305 { "tree", disambiguate_tree_only },
306 { "treeish", disambiguate_treeish_only },
307 { "blob", disambiguate_blob_only }
308 };
309 int i;
310
311 if (!value)
312 return config_error_nonbool(var);
313
314 for (i = 0; i < ARRAY_SIZE(hints); i++) {
315 if (!strcasecmp(value, hints[i].name)) {
316 default_disambiguate_hint = hints[i].fn;
317 return 0;
318 }
319 }
320
321 return error("unknown hint type for '%s': %s", var, value);
322}
323
ef9b0370
NTND
324static int init_object_disambiguation(struct repository *r,
325 const char *name, int len,
0016043b 326 struct disambiguate_state *ds)
9938af6a 327{
957d7406 328 int i;
9938af6a 329
7b38efad 330 if (len < MINIMUM_ABBREV || len > the_hash_algo->hexsz)
0016043b
JK
331 return -1;
332
333 memset(ds, 0, sizeof(*ds));
0016043b 334
af61c6e0 335 for (i = 0; i < len ;i++) {
9938af6a
JH
336 unsigned char c = name[i];
337 unsigned char val;
9938af6a
JH
338 if (c >= '0' && c <= '9')
339 val = c - '0';
340 else if (c >= 'a' && c <= 'f')
341 val = c - 'a' + 10;
342 else if (c >= 'A' && c <='F') {
343 val = c - 'A' + 10;
344 c -= 'A' - 'a';
345 }
346 else
347 return -1;
0016043b 348 ds->hex_pfx[i] = c;
9938af6a
JH
349 if (!(i & 1))
350 val <<= 4;
d2ee1185 351 ds->bin_pfx.hash[i >> 1] |= val;
9938af6a 352 }
0016043b
JK
353
354 ds->len = len;
59e4e34f 355 ds->hex_pfx[len] = '\0';
ef9b0370
NTND
356 ds->repo = r;
357 prepare_alt_odb(r);
957d7406
JH
358 return 0;
359}
360
1b7ba794 361static int show_ambiguous_object(const struct object_id *oid, void *data)
1ffa26c4
JK
362{
363 const struct disambiguate_state *ds = data;
364 struct strbuf desc = STRBUF_INIT;
365 int type;
366
ef9b0370 367 if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data))
1ffa26c4
JK
368 return 0;
369
ef9b0370 370 type = oid_object_info(ds->repo, oid, NULL);
1ffa26c4 371 if (type == OBJ_COMMIT) {
ef9b0370 372 struct commit *commit = lookup_commit(ds->repo, oid);
1ffa26c4
JK
373 if (commit) {
374 struct pretty_print_context pp = {0};
375 pp.date_mode.type = DATE_SHORT;
376 format_commit_message(commit, " %ad - %s", &desc, &pp);
377 }
378 } else if (type == OBJ_TAG) {
ef9b0370 379 struct tag *tag = lookup_tag(ds->repo, oid);
1ffa26c4
JK
380 if (!parse_tag(tag) && tag->tag)
381 strbuf_addf(&desc, " %s", tag->tag);
382 }
383
384 advise(" %s %s%s",
ef9b0370 385 repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV),
debca9d2 386 type_name(type) ? type_name(type) : "unknown type",
1ffa26c4
JK
387 desc.buf);
388
389 strbuf_release(&desc);
390 return 0;
391}
392
a885c93b
ÆAB
393static int collect_ambiguous(const struct object_id *oid, void *data)
394{
395 oid_array_append(data, oid);
396 return 0;
397}
398
ef9b0370
NTND
399static int repo_collect_ambiguous(struct repository *r,
400 const struct object_id *oid,
401 void *data)
402{
403 return collect_ambiguous(oid, data);
404}
405
7cfcb16b 406static int sort_ambiguous(const void *a, const void *b, void *ctx)
5cc044e0 407{
7cfcb16b 408 struct repository *sort_ambiguous_repo = ctx;
fae2ae45
NTND
409 int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
410 int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
5cc044e0
ÆAB
411 int a_type_sort;
412 int b_type_sort;
413
414 /*
415 * Sorts by hash within the same object type, just as
416 * oid_array_for_each_unique() would do.
417 */
418 if (a_type == b_type)
419 return oidcmp(a, b);
420
421 /*
422 * Between object types show tags, then commits, and finally
423 * trees and blobs.
424 *
425 * The object_type enum is commit, tree, blob, tag, but we
426 * want tag, commit, tree blob. Cleverly (perhaps too
427 * cleverly) do that with modulus, since the enum assigns 1 to
428 * commit, so tag becomes 0.
429 */
430 a_type_sort = a_type % 4;
431 b_type_sort = b_type % 4;
432 return a_type_sort > b_type_sort ? 1 : -1;
433}
434
fae2ae45
NTND
435static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
436{
7cfcb16b 437 QSORT_S(a->oid, a->nr, sort_ambiguous, r);
fae2ae45
NTND
438}
439
c6c0235b
NTND
440static enum get_oid_result get_short_oid(struct repository *r,
441 const char *name, int len,
d1dd94b3
DT
442 struct object_id *oid,
443 unsigned flags)
957d7406
JH
444{
445 int status;
957d7406 446 struct disambiguate_state ds;
321c89bf 447 int quietly = !!(flags & GET_OID_QUIETLY);
957d7406 448
c6c0235b 449 if (init_object_disambiguation(r, name, len, &ds) < 0)
957d7406 450 return -1;
99a19b43 451
321c89bf 452 if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
033abf97 453 BUG("multiple get_short_oid disambiguator flags");
259942f5 454
321c89bf 455 if (flags & GET_OID_COMMIT)
aa1dec9e 456 ds.fn = disambiguate_commit_only;
321c89bf 457 else if (flags & GET_OID_COMMITTISH)
e2643617 458 ds.fn = disambiguate_committish_only;
321c89bf 459 else if (flags & GET_OID_TREE)
daba53ae 460 ds.fn = disambiguate_tree_only;
321c89bf 461 else if (flags & GET_OID_TREEISH)
daba53ae 462 ds.fn = disambiguate_treeish_only;
321c89bf 463 else if (flags & GET_OID_BLOB)
daba53ae 464 ds.fn = disambiguate_blob_only;
5b33cb1f
JK
465 else
466 ds.fn = default_disambiguate_hint;
aa1dec9e 467
0016043b
JK
468 find_short_object_filename(&ds);
469 find_short_packed_object(&ds);
e82caf38 470 status = finish_object_disambiguation(&ds, oid);
99a19b43 471
6d67a993
JS
472 /*
473 * If we didn't find it, do the usual reprepare() slow-path,
474 * since the object may have recently been added to the repository
475 * or migrated from loose to packed.
476 */
477 if (status == MISSING_OBJECT) {
34e7771b 478 reprepare_packed_git(r);
6d67a993
JS
479 find_short_object_filename(&ds);
480 find_short_packed_object(&ds);
481 status = finish_object_disambiguation(&ds, oid);
482 }
483
1ffa26c4 484 if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
5cc044e0
ÆAB
485 struct oid_array collect = OID_ARRAY_INIT;
486
1ffa26c4
JK
487 error(_("short SHA1 %s is ambiguous"), ds.hex_pfx);
488
489 /*
490 * We may still have ambiguity if we simply saw a series of
491 * candidates that did not satisfy our hint function. In
492 * that case, we still want to show them, so disable the hint
493 * function entirely.
494 */
495 if (!ds.ambiguous)
496 ds.fn = NULL;
497
498 advise(_("The candidates are:"));
c6c0235b
NTND
499 repo_for_each_abbrev(r, ds.hex_pfx, collect_ambiguous, &collect);
500 sort_ambiguous_oid_array(r, &collect);
5cc044e0
ÆAB
501
502 if (oid_array_for_each(&collect, show_ambiguous_object, &ds))
503 BUG("show_ambiguous_object shouldn't return non-zero");
504 oid_array_clear(&collect);
1ffa26c4
JK
505 }
506
013f276e
JH
507 return status;
508}
509
4e99f2db
NTND
510int repo_for_each_abbrev(struct repository *r, const char *prefix,
511 each_abbrev_fn fn, void *cb_data)
957d7406 512{
910650d2 513 struct oid_array collect = OID_ARRAY_INIT;
957d7406 514 struct disambiguate_state ds;
fad6b9e5 515 int ret;
957d7406 516
4e99f2db 517 if (init_object_disambiguation(r, prefix, strlen(prefix), &ds) < 0)
957d7406 518 return -1;
957d7406 519
957d7406 520 ds.always_call_fn = 1;
ef9b0370 521 ds.fn = repo_collect_ambiguous;
fad6b9e5 522 ds.cb_data = &collect;
0016043b
JK
523 find_short_object_filename(&ds);
524 find_short_packed_object(&ds);
fad6b9e5 525
910650d2 526 ret = oid_array_for_each_unique(&collect, fn, cb_data);
527 oid_array_clear(&collect);
fad6b9e5 528 return ret;
957d7406
JH
529}
530
8e3f52d7
JK
531/*
532 * Return the slot of the most-significant bit set in "val". There are various
533 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
534 * probably not a big deal here.
535 */
536static unsigned msb(unsigned long val)
537{
538 unsigned r = 0;
539 while (val >>= 1)
540 r++;
541 return r;
542}
543
5b20ace6
DS
544struct min_abbrev_data {
545 unsigned int init_len;
546 unsigned int cur_len;
547 char *hex;
7f07c033 548 struct repository *repo;
626fd982 549 const struct object_id *oid;
5b20ace6
DS
550};
551
a42d6fd2
DS
552static inline char get_hex_char_from_oid(const struct object_id *oid,
553 unsigned int pos)
554{
555 static const char hex[] = "0123456789abcdef";
556
557 if ((pos & 1) == 0)
558 return hex[oid->hash[pos >> 1] >> 4];
559 else
560 return hex[oid->hash[pos >> 1] & 0xf];
561}
562
5b20ace6 563static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
013f276e 564{
5b20ace6 565 struct min_abbrev_data *mad = cb_data;
47dd0d59 566
5b20ace6 567 unsigned int i = mad->init_len;
a42d6fd2 568 while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
5b20ace6
DS
569 i++;
570
571 if (i < GIT_MAX_RAWSZ && i >= mad->cur_len)
572 mad->cur_len = i + 1;
573
574 return 0;
575}
576
ef9b0370
NTND
577static int repo_extend_abbrev_len(struct repository *r,
578 const struct object_id *oid,
579 void *cb_data)
580{
581 return extend_abbrev_len(oid, cb_data);
582}
583
8aac67a1
DS
584static void find_abbrev_len_for_midx(struct multi_pack_index *m,
585 struct min_abbrev_data *mad)
586{
587 int match = 0;
588 uint32_t num, first = 0;
589 struct object_id oid;
590 const struct object_id *mad_oid;
591
592 if (!m->num_objects)
593 return;
594
595 num = m->num_objects;
596 mad_oid = mad->oid;
597 match = bsearch_midx(mad_oid, m, &first);
598
599 /*
600 * first is now the position in the packfile where we would insert
601 * mad->hash if it does not exist (or the position of mad->hash if
602 * it does exist). Hence, we consider a maximum of two objects
603 * nearby for the abbreviation length.
604 */
605 mad->init_len = 0;
606 if (!match) {
607 if (nth_midxed_object_oid(&oid, m, first))
608 extend_abbrev_len(&oid, mad);
609 } else if (first < num - 1) {
610 if (nth_midxed_object_oid(&oid, m, first + 1))
611 extend_abbrev_len(&oid, mad);
612 }
613 if (first > 0) {
614 if (nth_midxed_object_oid(&oid, m, first - 1))
615 extend_abbrev_len(&oid, mad);
616 }
617 mad->init_len = mad->cur_len;
618}
619
0e87b856
DS
620static void find_abbrev_len_for_pack(struct packed_git *p,
621 struct min_abbrev_data *mad)
013f276e 622{
0e87b856 623 int match = 0;
0aaf05b3 624 uint32_t num, first = 0;
0e87b856 625 struct object_id oid;
0aaf05b3 626 const struct object_id *mad_oid;
0e87b856 627
af96fe33
DS
628 if (p->multi_pack_index)
629 return;
630
0e87b856
DS
631 if (open_pack_index(p) || !p->num_objects)
632 return;
633
634 num = p->num_objects;
0aaf05b3
DS
635 mad_oid = mad->oid;
636 match = bsearch_pack(mad_oid, p, &first);
0e87b856
DS
637
638 /*
639 * first is now the position in the packfile where we would insert
640 * mad->hash if it does not exist (or the position of mad->hash if
21abed50 641 * it does exist). Hence, we consider a maximum of two objects
0e87b856
DS
642 * nearby for the abbreviation length.
643 */
644 mad->init_len = 0;
645 if (!match) {
21abed50
DS
646 if (nth_packed_object_oid(&oid, p, first))
647 extend_abbrev_len(&oid, mad);
0e87b856 648 } else if (first < num - 1) {
21abed50
DS
649 if (nth_packed_object_oid(&oid, p, first + 1))
650 extend_abbrev_len(&oid, mad);
0e87b856
DS
651 }
652 if (first > 0) {
21abed50
DS
653 if (nth_packed_object_oid(&oid, p, first - 1))
654 extend_abbrev_len(&oid, mad);
0e87b856
DS
655 }
656 mad->init_len = mad->cur_len;
657}
658
659static void find_abbrev_len_packed(struct min_abbrev_data *mad)
660{
8aac67a1 661 struct multi_pack_index *m;
0e87b856
DS
662 struct packed_git *p;
663
7f07c033 664 for (m = get_multi_pack_index(mad->repo); m; m = m->next)
8aac67a1 665 find_abbrev_len_for_midx(m, mad);
7f07c033 666 for (p = get_packed_git(mad->repo); p; p = p->next)
0e87b856
DS
667 find_abbrev_len_for_pack(p, mad);
668}
669
8bb95572
NTND
670int repo_find_unique_abbrev_r(struct repository *r, char *hex,
671 const struct object_id *oid, int len)
5b20ace6
DS
672{
673 struct disambiguate_state ds;
674 struct min_abbrev_data mad;
675 struct object_id oid_ret;
8bb95572 676 const unsigned hexsz = r->hash_algo->hexsz;
7b38efad 677
e6c587c7 678 if (len < 0) {
8bb95572 679 unsigned long count = repo_approximate_object_count(r);
8e3f52d7
JK
680 /*
681 * Add one because the MSB only tells us the highest bit set,
682 * not including the value of all the _other_ bits (so "15"
683 * is only one off of 2^4, but the MSB is the 3rd bit.
684 */
685 len = msb(count) + 1;
686 /*
687 * We now know we have on the order of 2^len objects, which
688 * expects a collision at 2^(len/2). But we also care about hex
689 * chars, not bits, and there are 4 bits per hex. So all
42c78a21 690 * together we need to divide by 2 and round up.
8e3f52d7 691 */
42c78a21 692 len = DIV_ROUND_UP(len, 2);
8e3f52d7
JK
693 /*
694 * For very small repos, we stick with our regular fallback.
695 */
696 if (len < FALLBACK_DEFAULT_ABBREV)
697 len = FALLBACK_DEFAULT_ABBREV;
e6c587c7 698 }
8e3f52d7 699
aab9583f 700 oid_to_hex_r(hex, oid);
7b38efad 701 if (len == hexsz || !len)
702 return hexsz;
5b20ace6 703
8bb95572 704 mad.repo = r;
5b20ace6
DS
705 mad.init_len = len;
706 mad.cur_len = len;
707 mad.hex = hex;
626fd982 708 mad.oid = oid;
0e87b856
DS
709
710 find_abbrev_len_packed(&mad);
711
ef9b0370 712 if (init_object_disambiguation(r, hex, mad.cur_len, &ds) < 0)
0e87b856 713 return -1;
5b20ace6 714
ef9b0370 715 ds.fn = repo_extend_abbrev_len;
5b20ace6
DS
716 ds.always_call_fn = 1;
717 ds.cb_data = (void *)&mad;
718
719 find_short_object_filename(&ds);
5b20ace6
DS
720 (void)finish_object_disambiguation(&ds, &oid_ret);
721
722 hex[mad.cur_len] = 0;
723 return mad.cur_len;
af49c6d0
JK
724}
725
8bb95572
NTND
726const char *repo_find_unique_abbrev(struct repository *r,
727 const struct object_id *oid,
728 int len)
af49c6d0 729{
ef2ed501 730 static int bufno;
dc01505f 731 static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
3e98919a
RS
732 char *hex = hexbuffer[bufno];
733 bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
8bb95572 734 repo_find_unique_abbrev_r(r, hex, oid, len);
b66fde9a 735 return hex;
9938af6a
JH
736}
737
6677c466 738static int ambiguous_path(const char *path, int len)
af13cdf2
LT
739{
740 int slash = 1;
6677c466 741 int cnt;
af13cdf2 742
6677c466 743 for (cnt = 0; cnt < len; cnt++) {
af13cdf2
LT
744 switch (*path++) {
745 case '\0':
746 break;
747 case '/':
748 if (slash)
749 break;
750 slash = 1;
751 continue;
752 case '.':
753 continue;
754 default:
755 slash = 0;
756 continue;
757 }
c054d64e 758 break;
af13cdf2 759 }
6677c466 760 return slash;
af13cdf2
LT
761}
762
a1ad0eb0
JK
763static inline int at_mark(const char *string, int len,
764 const char **suffix, int nr)
ae0ba8e2 765{
ae0ba8e2
JH
766 int i;
767
a1ad0eb0 768 for (i = 0; i < nr; i++) {
ae0ba8e2
JH
769 int suffix_len = strlen(suffix[i]);
770 if (suffix_len <= len
244ea1b5 771 && !strncasecmp(string, suffix[i], suffix_len))
ae0ba8e2
JH
772 return suffix_len;
773 }
774 return 0;
775}
776
a1ad0eb0
JK
777static inline int upstream_mark(const char *string, int len)
778{
779 const char *suffix[] = { "@{upstream}", "@{u}" };
780 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
781}
782
adfe5d04
JK
783static inline int push_mark(const char *string, int len)
784{
785 const char *suffix[] = { "@{push}" };
786 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
787}
788
2b1790f5 789static enum get_oid_result get_oid_1(struct repository *r, const char *name, int len, struct object_id *oid, unsigned lookup_flags);
23a57129 790static int interpret_nth_prior_checkout(struct repository *r, const char *name, int namelen, struct strbuf *buf);
d18ba221 791
49281cf5
NTND
792static int get_oid_basic(struct repository *r, const char *str, int len,
793 struct object_id *oid, unsigned int flags)
e86eb666 794{
eedce784 795 static const char *warn_msg = "refname '%.*s' is ambiguous.";
798c35fc
NTND
796 static const char *object_name_msg = N_(
797 "Git normally never creates a ref that ends with 40 hex characters\n"
798 "because it will be ignored when you just specify 40-hex. These refs\n"
799 "may be created by mistake. For example,\n"
800 "\n"
328c6cb8 801 " git switch -c $br $(git rev-parse ...)\n"
798c35fc
NTND
802 "\n"
803 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
804 "examine these refs and maybe delete them. Turn this message off by\n"
8dc84fdc 805 "running \"git config advice.objectNameWarning false\"");
e82caf38 806 struct object_id tmp_oid;
ed378ec7 807 char *real_ref = NULL;
ab2a1a32 808 int refs_found = 0;
128fd54d 809 int at, reflog_len, nth_prior = 0;
9938af6a 810
49281cf5 811 if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {
832cf74c 812 if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
49281cf5 813 refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref);
832cf74c 814 if (refs_found > 0) {
25fba78d
JK
815 warning(warn_msg, len, str);
816 if (advice_object_name_warning)
817 fprintf(stderr, "%s\n", _(object_name_msg));
818 }
819 free(real_ref);
798c35fc 820 }
9938af6a 821 return 0;
798c35fc 822 }
9938af6a 823
d18ba221 824 /* basic@{time or number or -number} format to query ref-log */
694500ed 825 reflog_len = at = 0;
f265458f 826 if (len && str[len-1] == '}') {
e883a057 827 for (at = len-4; at >= 0; at--) {
ab2a1a32 828 if (str[at] == '@' && str[at+1] == '{') {
83d16bc7
RR
829 if (str[at+2] == '-') {
830 if (at != 0)
831 /* @{-N} not at start */
832 return -1;
128fd54d
FC
833 nth_prior = 1;
834 continue;
835 }
adfe5d04
JK
836 if (!upstream_mark(str + at, len - at) &&
837 !push_mark(str + at, len - at)) {
28fb8438
JS
838 reflog_len = (len-1) - (at+2);
839 len = at;
840 }
ab2a1a32
JH
841 break;
842 }
d556fae2
SP
843 }
844 }
845
af13cdf2 846 /* Accept only unambiguous ref paths. */
11cf8801 847 if (len && ambiguous_path(str, len))
af13cdf2
LT
848 return -1;
849
128fd54d 850 if (nth_prior) {
d18ba221 851 struct strbuf buf = STRBUF_INIT;
128fd54d
FC
852 int detached;
853
49281cf5
NTND
854 if (interpret_nth_prior_checkout(r, str, len, &buf) > 0) {
855 detached = (buf.len == r->hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
128fd54d
FC
856 strbuf_release(&buf);
857 if (detached)
858 return 0;
d18ba221 859 }
128fd54d
FC
860 }
861
862 if (!len && reflog_len)
11cf8801 863 /* allow "@{...}" to mean the current branch reflog */
49281cf5 864 refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref);
128fd54d 865 else if (reflog_len)
49281cf5 866 refs_found = repo_dwim_log(r, str, len, oid, &real_ref);
f2eba66d 867 else
49281cf5 868 refs_found = repo_dwim_ref(r, str, len, oid, &real_ref);
d556fae2
SP
869
870 if (!refs_found)
871 return -1;
872
321c89bf 873 if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
798c35fc 874 (refs_found > 1 ||
49281cf5 875 !get_short_oid(r, str, len, &tmp_oid, GET_OID_QUIETLY)))
eedce784 876 warning(warn_msg, len, str);
d556fae2 877
ab2a1a32 878 if (reflog_len) {
ab2a1a32 879 int nth, i;
dddbad72
JS
880 timestamp_t at_time;
881 timestamp_t co_time;
16d7cc90
JH
882 int co_tz, co_cnt;
883
fe558516 884 /* Is it asking for N-th entry, or approxidate? */
ab2a1a32
JH
885 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
886 char ch = str[at+2+i];
887 if ('0' <= ch && ch <= '9')
888 nth = nth * 10 + ch - '0';
889 else
890 nth = -1;
891 }
ea360dd0
SP
892 if (100000000 <= nth) {
893 at_time = nth;
894 nth = -1;
895 } else if (0 <= nth)
ab2a1a32 896 at_time = 0;
861f00e3 897 else {
93cfa7c7 898 int errors = 0;
861f00e3 899 char *tmp = xstrndup(str + at + 2, reflog_len);
93cfa7c7 900 at_time = approxidate_careful(tmp, &errors);
861f00e3 901 free(tmp);
28b35632
JK
902 if (errors) {
903 free(real_ref);
a5e10acb 904 return -1;
28b35632 905 }
861f00e3 906 }
49281cf5 907 if (read_ref_at(get_main_ref_store(r),
7fdff474 908 real_ref, flags, at_time, nth, oid, NULL,
16d7cc90 909 &co_time, &co_tz, &co_cnt)) {
305ebea0 910 if (!len) {
145136a9 911 if (!skip_prefix(real_ref, "refs/heads/", &str))
305ebea0 912 str = "HEAD";
145136a9 913 len = strlen(str);
305ebea0 914 }
c41a87dd 915 if (at_time) {
321c89bf 916 if (!(flags & GET_OID_QUIETLY)) {
b0418303
JK
917 warning(_("log for '%.*s' only goes back to %s"),
918 len, str,
a5481a6c 919 show_date(co_time, co_tz, DATE_MODE(RFC2822)));
c41a87dd
DA
920 }
921 } else {
321c89bf 922 if (flags & GET_OID_QUIETLY) {
c41a87dd
DA
923 exit(128);
924 }
b0418303 925 die(_("log for '%.*s' only has %d entries"),
e6eedc31
JS
926 len, str, co_cnt);
927 }
16d7cc90 928 }
d556fae2
SP
929 }
930
ed378ec7 931 free(real_ref);
d556fae2 932 return 0;
9938af6a
JH
933}
934
2b1790f5
NTND
935static enum get_oid_result get_parent(struct repository *r,
936 const char *name, int len,
d1dd94b3 937 struct object_id *result, int idx)
9938af6a 938{
1e43ed98 939 struct object_id oid;
2b1790f5 940 enum get_oid_result ret = get_oid_1(r, name, len, &oid,
d1dd94b3 941 GET_OID_COMMITTISH);
9938af6a
JH
942 struct commit *commit;
943 struct commit_list *p;
944
945 if (ret)
946 return ret;
2b1790f5 947 commit = lookup_commit_reference(r, &oid);
9938af6a 948 if (parse_commit(commit))
d1dd94b3 949 return MISSING_OBJECT;
9938af6a 950 if (!idx) {
e82caf38 951 oidcpy(result, &commit->object.oid);
d1dd94b3 952 return FOUND;
9938af6a
JH
953 }
954 p = commit->parents;
955 while (p) {
956 if (!--idx) {
e82caf38 957 oidcpy(result, &p->item->object.oid);
d1dd94b3 958 return FOUND;
9938af6a
JH
959 }
960 p = p->next;
961 }
d1dd94b3 962 return MISSING_OBJECT;
9938af6a
JH
963}
964
2b1790f5
NTND
965static enum get_oid_result get_nth_ancestor(struct repository *r,
966 const char *name, int len,
d1dd94b3
DT
967 struct object_id *result,
968 int generation)
4f7599ac 969{
1e43ed98 970 struct object_id oid;
621ff675
LT
971 struct commit *commit;
972 int ret;
973
2b1790f5 974 ret = get_oid_1(r, name, len, &oid, GET_OID_COMMITTISH);
4f7599ac
JH
975 if (ret)
976 return ret;
2b1790f5 977 commit = lookup_commit_reference(r, &oid);
621ff675 978 if (!commit)
d1dd94b3 979 return MISSING_OBJECT;
4f7599ac
JH
980
981 while (generation--) {
621ff675 982 if (parse_commit(commit) || !commit->parents)
d1dd94b3 983 return MISSING_OBJECT;
621ff675 984 commit = commit->parents->item;
4f7599ac 985 }
e82caf38 986 oidcpy(result, &commit->object.oid);
d1dd94b3 987 return FOUND;
4f7599ac
JH
988}
989
2b1790f5
NTND
990struct object *repo_peel_to_type(struct repository *r, const char *name, int namelen,
991 struct object *o, enum object_type expected_type)
81776315
JH
992{
993 if (name && !namelen)
994 namelen = strlen(name);
81776315 995 while (1) {
2b1790f5 996 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
81776315 997 return NULL;
a6a3f2cc 998 if (expected_type == OBJ_ANY || o->type == expected_type)
81776315
JH
999 return o;
1000 if (o->type == OBJ_TAG)
1001 o = ((struct tag*) o)->tagged;
1002 else if (o->type == OBJ_COMMIT)
2b1790f5 1003 o = &(repo_get_commit_tree(r, ((struct commit *)o))->object);
81776315
JH
1004 else {
1005 if (name)
1006 error("%.*s: expected %s type, but the object "
1007 "dereferences to %s type",
debca9d2
BW
1008 namelen, name, type_name(expected_type),
1009 type_name(o->type));
81776315
JH
1010 return NULL;
1011 }
1012 }
1013}
1014
2b1790f5
NTND
1015static int peel_onion(struct repository *r, const char *name, int len,
1016 struct object_id *oid, unsigned lookup_flags)
5385f52d 1017{
de37d50d 1018 struct object_id outer;
5385f52d 1019 const char *sp;
885a86ab 1020 unsigned int expected_type = 0;
5385f52d
JH
1021 struct object *o;
1022
1023 /*
1024 * "ref^{type}" dereferences ref repeatedly until you cannot
1025 * dereference anymore, or you get an object of given type,
1026 * whichever comes first. "ref^{}" means just dereference
1027 * tags until you get a non-tag. "ref^0" is a shorthand for
1028 * "ref^{commit}". "commit^{tree}" could be used to find the
1029 * top-level tree of the given commit.
1030 */
1031 if (len < 4 || name[len-1] != '}')
1032 return -1;
1033
1034 for (sp = name + len - 1; name <= sp; sp--) {
1035 int ch = *sp;
1036 if (ch == '{' && name < sp && sp[-1] == '^')
1037 break;
1038 }
1039 if (sp <= name)
1040 return -1;
1041
1042 sp++; /* beginning of type name, or closing brace for empty */
59556548 1043 if (starts_with(sp, "commit}"))
1974632c 1044 expected_type = OBJ_COMMIT;
59556548 1045 else if (starts_with(sp, "tag}"))
75aa26d3 1046 expected_type = OBJ_TAG;
59556548 1047 else if (starts_with(sp, "tree}"))
1974632c 1048 expected_type = OBJ_TREE;
59556548 1049 else if (starts_with(sp, "blob}"))
1974632c 1050 expected_type = OBJ_BLOB;
59556548 1051 else if (starts_with(sp, "object}"))
a6a3f2cc 1052 expected_type = OBJ_ANY;
5385f52d 1053 else if (sp[0] == '}')
1974632c 1054 expected_type = OBJ_NONE;
32574b68
NTND
1055 else if (sp[0] == '/')
1056 expected_type = OBJ_COMMIT;
5385f52d
JH
1057 else
1058 return -1;
1059
321c89bf 1060 lookup_flags &= ~GET_OID_DISAMBIGUATORS;
e2643617 1061 if (expected_type == OBJ_COMMIT)
321c89bf 1062 lookup_flags |= GET_OID_COMMITTISH;
ed1ca602 1063 else if (expected_type == OBJ_TREE)
321c89bf 1064 lookup_flags |= GET_OID_TREEISH;
e2643617 1065
2b1790f5 1066 if (get_oid_1(r, name, sp - name - 2, &outer, lookup_flags))
5385f52d
JH
1067 return -1;
1068
2b1790f5 1069 o = parse_object(r, &outer);
5385f52d
JH
1070 if (!o)
1071 return -1;
885a86ab 1072 if (!expected_type) {
2b1790f5
NTND
1073 o = deref_tag(r, o, name, sp - name - 2);
1074 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
6e1c6c10 1075 return -1;
e82caf38 1076 oidcpy(oid, &o->oid);
32574b68 1077 return 0;
5385f52d 1078 }
32574b68
NTND
1079
1080 /*
1081 * At this point, the syntax look correct, so
1082 * if we do not get the needed object, we should
1083 * barf.
1084 */
2b1790f5 1085 o = repo_peel_to_type(r, name, len, o, expected_type);
32574b68 1086 if (!o)
81776315 1087 return -1;
32574b68 1088
e82caf38 1089 oidcpy(oid, &o->oid);
32574b68
NTND
1090 if (sp[0] == '/') {
1091 /* "$commit^{/foo}" */
1092 char *prefix;
1093 int ret;
1094 struct commit_list *list = NULL;
1095
81776315 1096 /*
4322842a
NTND
1097 * $commit^{/}. Some regex implementation may reject.
1098 * We don't need regex anyway. '' pattern always matches.
5385f52d 1099 */
4322842a 1100 if (sp[1] == '}')
81776315 1101 return 0;
4322842a 1102
32574b68
NTND
1103 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
1104 commit_list_insert((struct commit *)o, &list);
2b1790f5 1105 ret = get_oid_oneline(r, prefix, oid, list);
32574b68
NTND
1106 free(prefix);
1107 return ret;
5385f52d
JH
1108 }
1109 return 0;
1110}
1111
0c6b5ba1
NTND
1112static int get_describe_name(struct repository *r,
1113 const char *name, int len,
1114 struct object_id *oid)
7dd45e15
JH
1115{
1116 const char *cp;
321c89bf 1117 unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
7dd45e15
JH
1118
1119 for (cp = name + len - 1; name + 2 <= cp; cp--) {
1120 char ch = *cp;
6f75d45b 1121 if (!isxdigit(ch)) {
7dd45e15
JH
1122 /* We must be looking at g in "SOMETHING-g"
1123 * for it to be describe output.
1124 */
1125 if (ch == 'g' && cp[-1] == '-') {
1126 cp++;
1127 len -= cp - name;
0c6b5ba1 1128 return get_short_oid(r,
c6c0235b 1129 cp, len, oid, flags);
7dd45e15
JH
1130 }
1131 }
1132 }
1133 return -1;
1134}
1135
2b1790f5
NTND
1136static enum get_oid_result get_oid_1(struct repository *r,
1137 const char *name, int len,
d1dd94b3
DT
1138 struct object_id *oid,
1139 unsigned lookup_flags)
9938af6a 1140{
0601dbe1 1141 int ret, has_suffix;
4f7599ac 1142 const char *cp;
9938af6a 1143
621ff675
LT
1144 /*
1145 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
4f7599ac 1146 */
0601dbe1 1147 has_suffix = 0;
4f7599ac
JH
1148 for (cp = name + len - 1; name <= cp; cp--) {
1149 int ch = *cp;
1150 if ('0' <= ch && ch <= '9')
1151 continue;
0601dbe1
JH
1152 if (ch == '~' || ch == '^')
1153 has_suffix = ch;
4f7599ac
JH
1154 break;
1155 }
0601dbe1
JH
1156
1157 if (has_suffix) {
59fa5f5a 1158 unsigned int num = 0;
4f7599ac
JH
1159 int len1 = cp - name;
1160 cp++;
59fa5f5a
RS
1161 while (cp < name + len) {
1162 unsigned int digit = *cp++ - '0';
1163 if (unsigned_mult_overflows(num, 10))
1164 return MISSING_OBJECT;
1165 num *= 10;
1166 if (unsigned_add_overflows(num, digit))
1167 return MISSING_OBJECT;
1168 num += digit;
1169 }
621ff675
LT
1170 if (!num && len1 == len - 1)
1171 num = 1;
59fa5f5a
RS
1172 else if (num > INT_MAX)
1173 return MISSING_OBJECT;
621ff675 1174 if (has_suffix == '^')
2b1790f5 1175 return get_parent(r, name, len1, oid, num);
0601dbe1 1176 /* else if (has_suffix == '~') -- goes without saying */
2b1790f5 1177 return get_nth_ancestor(r, name, len1, oid, num);
4f7599ac
JH
1178 }
1179
2b1790f5 1180 ret = peel_onion(r, name, len, oid, lookup_flags);
5385f52d 1181 if (!ret)
d1dd94b3 1182 return FOUND;
5385f52d 1183
2b1790f5 1184 ret = get_oid_basic(r, name, len, oid, lookup_flags);
9938af6a 1185 if (!ret)
d1dd94b3 1186 return FOUND;
7dd45e15
JH
1187
1188 /* It could be describe output that is "SOMETHING-gXXXX" */
2b1790f5 1189 ret = get_describe_name(r, name, len, oid);
7dd45e15 1190 if (!ret)
d1dd94b3 1191 return FOUND;
7dd45e15 1192
2b1790f5 1193 return get_short_oid(r, name, len, oid, lookup_flags);
9938af6a
JH
1194}
1195
f7bff003
JH
1196/*
1197 * This interprets names like ':/Initial revision of "git"' by searching
1198 * through history and returning the first commit whose message starts
3d045897 1199 * the given regular expression.
f7bff003 1200 *
0769854f
WP
1201 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1202 *
1203 * For a literal '!' character at the beginning of a pattern, you have to repeat
1204 * that, like: ':/!!foo'
1205 *
1206 * For future extension, all other sequences beginning with ':/!' are reserved.
f7bff003 1207 */
208acbfb
NTND
1208
1209/* Remember to update object flag allocation in object.h */
f7bff003
JH
1210#define ONELINE_SEEN (1u<<20)
1211
c931ba4e
NTND
1212struct handle_one_ref_cb {
1213 struct repository *repo;
1214 struct commit_list **list;
1215};
1216
9c5fe0b8
MH
1217static int handle_one_ref(const char *path, const struct object_id *oid,
1218 int flag, void *cb_data)
28a4d940 1219{
c931ba4e
NTND
1220 struct handle_one_ref_cb *cb = cb_data;
1221 struct commit_list **list = cb->list;
1222 struct object *object = parse_object(cb->repo, oid);
28a4d940
JS
1223 if (!object)
1224 return 0;
affeef12 1225 if (object->type == OBJ_TAG) {
c931ba4e 1226 object = deref_tag(cb->repo, object, path,
a74093da 1227 strlen(path));
affeef12
MK
1228 if (!object)
1229 return 0;
1230 }
28a4d940
JS
1231 if (object->type != OBJ_COMMIT)
1232 return 0;
e8d1dfe6 1233 commit_list_insert((struct commit *)object, list);
28a4d940
JS
1234 return 0;
1235}
1236
0bb41a19
NTND
1237static int get_oid_oneline(struct repository *r,
1238 const char *prefix, struct object_id *oid,
1239 struct commit_list *list)
28a4d940 1240{
84baa31b 1241 struct commit_list *backup = NULL, *l;
28042dbc 1242 int found = 0;
0769854f 1243 int negative = 0;
57895105 1244 regex_t regex;
28a4d940
JS
1245
1246 if (prefix[0] == '!') {
28a4d940 1247 prefix++;
0769854f
WP
1248
1249 if (prefix[0] == '-') {
1250 prefix++;
1251 negative = 1;
1252 } else if (prefix[0] != '!') {
e6a6a768 1253 return -1;
0769854f 1254 }
28a4d940 1255 }
57895105
LT
1256
1257 if (regcomp(&regex, prefix, REG_EXTENDED))
aac4fac1 1258 return -1;
57895105 1259
84baa31b
NTND
1260 for (l = list; l; l = l->next) {
1261 l->item->object.flags |= ONELINE_SEEN;
28a4d940 1262 commit_list_insert(l->item, &backup);
84baa31b 1263 }
ed8ad7e2 1264 while (list) {
ba41c1c9 1265 const char *p, *buf;
1358e7d6 1266 struct commit *commit;
28042dbc 1267 int matches;
ed8ad7e2
JM
1268
1269 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
0bb41a19 1270 if (!parse_object(r, &commit->object.oid))
283cdbcf 1271 continue;
8597ea3a 1272 buf = get_commit_buffer(commit, NULL);
ba41c1c9 1273 p = strstr(buf, "\n\n");
0769854f 1274 matches = negative ^ (p && !regexec(&regex, p + 2, 0, NULL, 0));
ba41c1c9 1275 unuse_commit_buffer(commit, buf);
28042dbc
JH
1276
1277 if (matches) {
e82caf38 1278 oidcpy(oid, &commit->object.oid);
28042dbc 1279 found = 1;
28a4d940
JS
1280 break;
1281 }
1282 }
57895105 1283 regfree(&regex);
28a4d940
JS
1284 free_commit_list(list);
1285 for (l = backup; l; l = l->next)
1286 clear_commit_marks(l->item, ONELINE_SEEN);
28042dbc
JH
1287 free_commit_list(backup);
1288 return found ? 0 : -1;
28a4d940
JS
1289}
1290
ae5a6c36 1291struct grab_nth_branch_switch_cbdata {
98f85ff4 1292 int remaining;
4b3aa170 1293 struct strbuf *sb;
ae5a6c36
JH
1294};
1295
9461d272 1296static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid,
dddbad72 1297 const char *email, timestamp_t timestamp, int tz,
ae5a6c36
JH
1298 const char *message, void *cb_data)
1299{
1300 struct grab_nth_branch_switch_cbdata *cb = cb_data;
a884d0cb
TR
1301 const char *match = NULL, *target = NULL;
1302 size_t len;
1303
95b567c7 1304 if (skip_prefix(message, "checkout: moving from ", &match))
d7c03c1f 1305 target = strstr(match, " to ");
ae5a6c36 1306
c829774c 1307 if (!match || !target)
ae5a6c36 1308 return 0;
98f85ff4
JH
1309 if (--(cb->remaining) == 0) {
1310 len = target - match;
4b3aa170
RS
1311 strbuf_reset(cb->sb);
1312 strbuf_add(cb->sb, match, len);
98f85ff4
JH
1313 return 1; /* we are done */
1314 }
ae5a6c36
JH
1315 return 0;
1316}
1317
1318/*
ae0ba8e2
JH
1319 * Parse @{-N} syntax, return the number of characters parsed
1320 * if successful; otherwise signal an error with negative value.
ae5a6c36 1321 */
23a57129
NTND
1322static int interpret_nth_prior_checkout(struct repository *r,
1323 const char *name, int namelen,
8cd4249c 1324 struct strbuf *buf)
ae5a6c36 1325{
c2883e62 1326 long nth;
98f85ff4 1327 int retval;
ae5a6c36 1328 struct grab_nth_branch_switch_cbdata cb;
a884d0cb
TR
1329 const char *brace;
1330 char *num_end;
ae5a6c36 1331
8cd4249c
JK
1332 if (namelen < 4)
1333 return -1;
ae5a6c36
JH
1334 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
1335 return -1;
8cd4249c 1336 brace = memchr(name, '}', namelen);
a884d0cb
TR
1337 if (!brace)
1338 return -1;
98f85ff4 1339 nth = strtol(name + 3, &num_end, 10);
a884d0cb 1340 if (num_end != brace)
ae5a6c36 1341 return -1;
c2883e62
JH
1342 if (nth <= 0)
1343 return -1;
98f85ff4 1344 cb.remaining = nth;
4b3aa170 1345 cb.sb = buf;
98f85ff4 1346
23a57129
NTND
1347 retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r),
1348 "HEAD", grab_nth_branch_switch, &cb);
1349 if (0 < retval) {
98f85ff4 1350 retval = brace - name + 1;
23a57129
NTND
1351 } else
1352 retval = 0;
a884d0cb 1353
39765e59 1354 return retval;
ae5a6c36
JH
1355}
1356
0daf7ff6
NTND
1357int repo_get_oid_mb(struct repository *r,
1358 const char *name,
1359 struct object_id *oid)
619a644d
JH
1360{
1361 struct commit *one, *two;
1362 struct commit_list *mbs;
151b2911 1363 struct object_id oid_tmp;
619a644d
JH
1364 const char *dots;
1365 int st;
1366
1367 dots = strstr(name, "...");
1368 if (!dots)
0daf7ff6 1369 return repo_get_oid(r, name, oid);
619a644d 1370 if (dots == name)
0daf7ff6 1371 st = repo_get_oid(r, "HEAD", &oid_tmp);
619a644d
JH
1372 else {
1373 struct strbuf sb;
1374 strbuf_init(&sb, dots - name);
1375 strbuf_add(&sb, name, dots - name);
0daf7ff6 1376 st = repo_get_oid_committish(r, sb.buf, &oid_tmp);
619a644d
JH
1377 strbuf_release(&sb);
1378 }
1379 if (st)
1380 return st;
0daf7ff6 1381 one = lookup_commit_reference_gently(r, &oid_tmp, 0);
619a644d
JH
1382 if (!one)
1383 return -1;
1384
0daf7ff6 1385 if (repo_get_oid_committish(r, dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
619a644d 1386 return -1;
0daf7ff6 1387 two = lookup_commit_reference_gently(r, &oid_tmp, 0);
619a644d
JH
1388 if (!two)
1389 return -1;
34e7771b 1390 mbs = repo_get_merge_bases(r, one, two);
619a644d
JH
1391 if (!mbs || mbs->next)
1392 st = -1;
1393 else {
1394 st = 0;
151b2911 1395 oidcpy(oid, &mbs->item->object.oid);
619a644d
JH
1396 }
1397 free_commit_list(mbs);
1398 return st;
1399}
1400
9ba89f48
FC
1401/* parse @something syntax, when 'something' is not {.*} */
1402static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1403{
1404 const char *next;
1405
1406 if (len || name[1] == '{')
1407 return -1;
1408
1409 /* make sure it's a single @, or @@{.*}, not @foo */
8cd4249c 1410 next = memchr(name + len + 1, '@', namelen - len - 1);
9ba89f48
FC
1411 if (next && next[1] != '{')
1412 return -1;
1413 if (!next)
1414 next = name + namelen;
1415 if (next != name + 1)
1416 return -1;
1417
1418 strbuf_reset(buf);
1419 strbuf_add(buf, "HEAD", 4);
1420 return 1;
1421}
1422
71588ed2
NTND
1423static int reinterpret(struct repository *r,
1424 const char *name, int namelen, int len,
0e9f62da 1425 struct strbuf *buf, unsigned allowed)
7a0a49a7
FC
1426{
1427 /* we have extra data, which might need further processing */
1428 struct strbuf tmp = STRBUF_INIT;
1429 int used = buf->len;
1430 int ret;
1431
1432 strbuf_add(buf, name + len, namelen - len);
71588ed2 1433 ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, allowed);
7a0a49a7
FC
1434 /* that data was not interpreted, remove our cruft */
1435 if (ret < 0) {
1436 strbuf_setlen(buf, used);
1437 return len;
1438 }
1439 strbuf_reset(buf);
1440 strbuf_addbuf(buf, &tmp);
1441 strbuf_release(&tmp);
1442 /* tweak for size of {-N} versus expanded ref name */
1443 return ret - used + len;
1444}
1445
ea1c873c 1446static void set_shortened_ref(struct repository *r, struct strbuf *buf, const char *ref)
a39c14af 1447{
ea1c873c 1448 char *s = refs_shorten_unambiguous_ref(get_main_ref_store(r), ref, 0);
a39c14af
JK
1449 strbuf_reset(buf);
1450 strbuf_addstr(buf, s);
1451 free(s);
1452}
1453
0e9f62da
JK
1454static int branch_interpret_allowed(const char *refname, unsigned allowed)
1455{
1456 if (!allowed)
1457 return 1;
1458
1459 if ((allowed & INTERPRET_BRANCH_LOCAL) &&
1460 starts_with(refname, "refs/heads/"))
1461 return 1;
1462 if ((allowed & INTERPRET_BRANCH_REMOTE) &&
1463 starts_with(refname, "refs/remotes/"))
1464 return 1;
1465
1466 return 0;
1467}
1468
ea1c873c
NTND
1469static int interpret_branch_mark(struct repository *r,
1470 const char *name, int namelen,
48c58471
JK
1471 int at, struct strbuf *buf,
1472 int (*get_mark)(const char *, int),
1473 const char *(*get_data)(struct branch *,
0e9f62da
JK
1474 struct strbuf *),
1475 unsigned allowed)
a39c14af
JK
1476{
1477 int len;
48c58471
JK
1478 struct branch *branch;
1479 struct strbuf err = STRBUF_INIT;
1480 const char *value;
a39c14af 1481
48c58471 1482 len = get_mark(name + at, namelen - at);
a39c14af
JK
1483 if (!len)
1484 return -1;
1485
3f6eb30f
JK
1486 if (memchr(name, ':', at))
1487 return -1;
1488
48c58471
JK
1489 if (at) {
1490 char *name_str = xmemdupz(name, at);
1491 branch = branch_get(name_str);
1492 free(name_str);
1493 } else
1494 branch = branch_get(NULL);
1495
1496 value = get_data(branch, &err);
1497 if (!value)
1498 die("%s", err.buf);
1499
0e9f62da
JK
1500 if (!branch_interpret_allowed(value, allowed))
1501 return -1;
1502
ea1c873c 1503 set_shortened_ref(r, buf, value);
a39c14af
JK
1504 return len + at;
1505}
1506
8f56e9d4
NTND
1507int repo_interpret_branch_name(struct repository *r,
1508 const char *name, int namelen,
1509 struct strbuf *buf,
1510 unsigned allowed)
ae0ba8e2 1511{
f278f40f 1512 char *at;
9892d5d4 1513 const char *start;
13228c30 1514 int len;
ae0ba8e2 1515
cf99a761
FC
1516 if (!namelen)
1517 namelen = strlen(name);
1518
0e9f62da 1519 if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) {
71588ed2 1520 len = interpret_nth_prior_checkout(r, name, namelen, buf);
0e9f62da
JK
1521 if (!len) {
1522 return len; /* syntax Ok, not enough switches */
1523 } else if (len > 0) {
1524 if (len == namelen)
1525 return len; /* consumed all */
1526 else
71588ed2 1527 return reinterpret(r, name, namelen, len, buf, allowed);
0e9f62da 1528 }
d46a8301
JK
1529 }
1530
9892d5d4
JK
1531 for (start = name;
1532 (at = memchr(start, '@', namelen - (start - name)));
1533 start = at + 1) {
9ba89f48 1534
0e9f62da
JK
1535 if (!allowed || (allowed & INTERPRET_BRANCH_HEAD)) {
1536 len = interpret_empty_at(name, namelen, at - name, buf);
1537 if (len > 0)
71588ed2 1538 return reinterpret(r, name, namelen, len, buf,
0e9f62da
JK
1539 allowed);
1540 }
9ba89f48 1541
71588ed2 1542 len = interpret_branch_mark(r, name, namelen, at - name, buf,
0e9f62da
JK
1543 upstream_mark, branch_get_upstream,
1544 allowed);
9892d5d4
JK
1545 if (len > 0)
1546 return len;
adfe5d04 1547
71588ed2 1548 len = interpret_branch_mark(r, name, namelen, at - name, buf,
0e9f62da
JK
1549 push_mark, branch_get_push,
1550 allowed);
9892d5d4
JK
1551 if (len > 0)
1552 return len;
bb0dab5d 1553 }
9ba89f48 1554
a39c14af 1555 return -1;
ae0ba8e2
JH
1556}
1557
0e9f62da 1558void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
6bab74e7
JN
1559{
1560 int len = strlen(name);
0e9f62da 1561 int used = interpret_branch_name(name, len, sb, allowed);
84cf2466 1562
84cf2466
JH
1563 if (used < 0)
1564 used = 0;
1565 strbuf_add(sb, name + used, len - used);
6bab74e7
JN
1566}
1567
1568int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1569{
7c3f847a
JH
1570 if (startup_info->have_repository)
1571 strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
1572 else
1573 strbuf_addstr(sb, name);
a625b092
JH
1574
1575 /*
1576 * This splice must be done even if we end up rejecting the
1577 * name; builtin/branch.c::copy_or_rename_branch() still wants
1578 * to see what the name expanded to so that "branch -m" can be
1579 * used as a tool to correct earlier mistakes.
1580 */
6bab74e7 1581 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
a625b092
JH
1582
1583 if (*name == '-' ||
1584 !strcmp(sb->buf, "refs/heads/HEAD"))
1585 return -1;
1586
8d9c5010 1587 return check_refname_format(sb->buf, 0);
6bab74e7
JN
1588}
1589
9938af6a 1590/*
e82caf38 1591 * This is like "get_oid_basic()", except it allows "object ID expressions",
9938af6a
JH
1592 * notably "xyz^" for "parent of xyz"
1593 */
ec580eaa 1594int repo_get_oid(struct repository *r, const char *name, struct object_id *oid)
2764fd93 1595{
e82caf38 1596 struct object_context unused;
ec580eaa 1597 return get_oid_with_context(r, name, 0, oid, &unused);
2764fd93 1598}
1599
f5116f43
PSU
1600/*
1601 * This returns a non-zero value if the string (built using printf
1602 * format and the given arguments) is not a valid object.
1603 */
1604int get_oidf(struct object_id *oid, const char *fmt, ...)
1605{
1606 va_list ap;
1607 int ret;
1608 struct strbuf sb = STRBUF_INIT;
1609
1610 va_start(ap, fmt);
1611 strbuf_vaddf(&sb, fmt, ap);
1612 va_end(ap);
1613
1614 ret = get_oid(sb.buf, oid);
1615 strbuf_release(&sb);
1616
1617 return ret;
1618}
2764fd93 1619
cd74e473 1620/*
a8a5406a 1621 * Many callers know that the user meant to name a commit-ish by
cd74e473
JH
1622 * syntactical positions where the object name appears. Calling this
1623 * function allows the machinery to disambiguate shorter-than-unique
a8a5406a 1624 * abbreviated object names between commit-ish and others.
cd74e473
JH
1625 *
1626 * Note that this does NOT error out when the named object is not a
a8a5406a 1627 * commit-ish. It is merely to give a hint to the disambiguation
cd74e473
JH
1628 * machinery.
1629 */
65e50464
NTND
1630int repo_get_oid_committish(struct repository *r,
1631 const char *name,
1632 struct object_id *oid)
cd74e473
JH
1633{
1634 struct object_context unused;
65e50464 1635 return get_oid_with_context(r, name, GET_OID_COMMITTISH,
e82caf38 1636 oid, &unused);
cd74e473
JH
1637}
1638
65e50464
NTND
1639int repo_get_oid_treeish(struct repository *r,
1640 const char *name,
1641 struct object_id *oid)
daba53ae
JH
1642{
1643 struct object_context unused;
65e50464 1644 return get_oid_with_context(r, name, GET_OID_TREEISH,
e82caf38 1645 oid, &unused);
daba53ae
JH
1646}
1647
65e50464
NTND
1648int repo_get_oid_commit(struct repository *r,
1649 const char *name,
1650 struct object_id *oid)
daba53ae
JH
1651{
1652 struct object_context unused;
65e50464 1653 return get_oid_with_context(r, name, GET_OID_COMMIT,
e82caf38 1654 oid, &unused);
daba53ae
JH
1655}
1656
65e50464
NTND
1657int repo_get_oid_tree(struct repository *r,
1658 const char *name,
1659 struct object_id *oid)
daba53ae
JH
1660{
1661 struct object_context unused;
65e50464 1662 return get_oid_with_context(r, name, GET_OID_TREE,
e82caf38 1663 oid, &unused);
daba53ae
JH
1664}
1665
65e50464
NTND
1666int repo_get_oid_blob(struct repository *r,
1667 const char *name,
1668 struct object_id *oid)
daba53ae
JH
1669{
1670 struct object_context unused;
65e50464 1671 return get_oid_with_context(r, name, GET_OID_BLOB,
e82caf38 1672 oid, &unused);
a0cd87a5
MK
1673}
1674
009fee47 1675/* Must be called only when object_name:filename doesn't exist. */
50ddb089
NTND
1676static void diagnose_invalid_oid_path(struct repository *r,
1677 const char *prefix,
e82caf38 1678 const char *filename,
1679 const struct object_id *tree_oid,
1680 const char *object_name,
1681 int object_name_len)
009fee47 1682{
e82caf38 1683 struct object_id oid;
5ec1e728 1684 unsigned short mode;
009fee47
MM
1685
1686 if (!prefix)
1687 prefix = "";
1688
dbe44faa 1689 if (file_exists(filename))
b0418303 1690 die(_("path '%s' exists on disk, but not in '%.*s'"),
b2981d06 1691 filename, object_name_len, object_name);
c7054209 1692 if (is_missing_file_error(errno)) {
b2724c87 1693 char *fullname = xstrfmt("%s%s", prefix, filename);
009fee47 1694
50ddb089 1695 if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
b0418303
JK
1696 die(_("path '%s' exists, but not '%s'\n"
1697 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
009fee47
MM
1698 fullname,
1699 filename,
b2981d06 1700 object_name_len, object_name,
e41d718c 1701 fullname,
b2981d06 1702 object_name_len, object_name,
e41d718c 1703 filename);
009fee47 1704 }
b0418303 1705 die(_("path '%s' does not exist in '%.*s'"),
b2981d06 1706 filename, object_name_len, object_name);
009fee47
MM
1707 }
1708}
1709
1710/* Must be called only when :stage:filename doesn't exist. */
0488481e 1711static void diagnose_invalid_index_path(struct repository *r,
3a7a698e 1712 int stage,
009fee47
MM
1713 const char *prefix,
1714 const char *filename)
1715{
0488481e 1716 struct index_state *istate = r->index;
9c5e6c80 1717 const struct cache_entry *ce;
009fee47
MM
1718 int pos;
1719 unsigned namelen = strlen(filename);
43bb66ae 1720 struct strbuf fullname = STRBUF_INIT;
009fee47
MM
1721
1722 if (!prefix)
1723 prefix = "";
1724
1725 /* Wrong stage number? */
3a7a698e 1726 pos = index_name_pos(istate, filename, namelen);
009fee47
MM
1727 if (pos < 0)
1728 pos = -pos - 1;
3a7a698e
NTND
1729 if (pos < istate->cache_nr) {
1730 ce = istate->cache[pos];
77e8466f
MH
1731 if (ce_namelen(ce) == namelen &&
1732 !memcmp(ce->name, filename, namelen))
b0418303
JK
1733 die(_("path '%s' is in the index, but not at stage %d\n"
1734 "hint: Did you mean ':%d:%s'?"),
77e8466f
MH
1735 filename, stage,
1736 ce_stage(ce), filename);
1737 }
009fee47
MM
1738
1739 /* Confusion between relative and absolute filenames? */
43bb66ae
JK
1740 strbuf_addstr(&fullname, prefix);
1741 strbuf_addstr(&fullname, filename);
3a7a698e 1742 pos = index_name_pos(istate, fullname.buf, fullname.len);
009fee47
MM
1743 if (pos < 0)
1744 pos = -pos - 1;
3a7a698e
NTND
1745 if (pos < istate->cache_nr) {
1746 ce = istate->cache[pos];
43bb66ae
JK
1747 if (ce_namelen(ce) == fullname.len &&
1748 !memcmp(ce->name, fullname.buf, fullname.len))
b0418303
JK
1749 die(_("path '%s' is in the index, but not '%s'\n"
1750 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
43bb66ae
JK
1751 fullname.buf, filename,
1752 ce_stage(ce), fullname.buf,
e41d718c 1753 ce_stage(ce), filename);
77e8466f 1754 }
009fee47 1755
0488481e 1756 if (repo_file_exists(r, filename))
b0418303 1757 die(_("path '%s' exists on disk, but not in the index"), filename);
c7054209 1758 if (is_missing_file_error(errno))
b0418303 1759 die(_("path '%s' does not exist (neither on disk nor in the index)"),
009fee47
MM
1760 filename);
1761
43bb66ae 1762 strbuf_release(&fullname);
009fee47
MM
1763}
1764
1765
0381f7f3 1766static char *resolve_relative_path(struct repository *r, const char *rel)
979f7929 1767{
59556548 1768 if (!starts_with(rel, "./") && !starts_with(rel, "../"))
979f7929
NTND
1769 return NULL;
1770
0381f7f3 1771 if (r != the_repository || !is_inside_work_tree())
b0418303 1772 die(_("relative path syntax can't be used outside working tree"));
979f7929
NTND
1773
1774 /* die() inside prefix_path() if resolved path is outside worktree */
1775 return prefix_path(startup_info->prefix,
1776 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1777 rel);
1778}
1779
7589e636 1780static enum get_oid_result get_oid_with_context_1(struct repository *repo,
3a7a698e 1781 const char *name,
e82caf38 1782 unsigned flags,
1783 const char *prefix,
1784 struct object_id *oid,
1785 struct object_context *oc)
a0cd87a5
MK
1786{
1787 int ret, bracket_depth;
73b0e5af
JH
1788 int namelen = strlen(name);
1789 const char *cp;
321c89bf 1790 int only_to_die = flags & GET_OID_ONLY_TO_DIE;
5119602a 1791
7243ffdd 1792 if (only_to_die)
321c89bf 1793 flags |= GET_OID_QUIETLY;
7243ffdd 1794
573285e5
CP
1795 memset(oc, 0, sizeof(*oc));
1796 oc->mode = S_IFINVALID;
d72cae12 1797 strbuf_init(&oc->symlink_path, 0);
2b1790f5 1798 ret = get_oid_1(repo, name, namelen, oid, flags);
73b0e5af
JH
1799 if (!ret)
1800 return ret;
33bd598c
JH
1801 /*
1802 * sha1:path --> object name of path in ent sha1
979f7929
NTND
1803 * :path -> object name of absolute path in index
1804 * :./path -> object name of path relative to cwd in index
73b0e5af 1805 * :[0-3]:path -> object name of path in index at stage
95ad6d2d 1806 * :/foo -> recent commit matching foo
73b0e5af
JH
1807 */
1808 if (name[0] == ':') {
1809 int stage = 0;
9c5e6c80 1810 const struct cache_entry *ce;
979f7929 1811 char *new_path = NULL;
73b0e5af 1812 int pos;
2e83b66c 1813 if (!only_to_die && namelen > 2 && name[1] == '/') {
c931ba4e 1814 struct handle_one_ref_cb cb;
84baa31b 1815 struct commit_list *list = NULL;
2b2a5be3 1816
c931ba4e
NTND
1817 cb.repo = repo;
1818 cb.list = &list;
1819 refs_for_each_ref(repo->refs, handle_one_ref, &cb);
1820 refs_head_ref(repo->refs, handle_one_ref, &cb);
e8d1dfe6 1821 commit_list_sort_by_date(&list);
0bb41a19 1822 return get_oid_oneline(repo, name + 2, oid, list);
84baa31b 1823 }
73b0e5af
JH
1824 if (namelen < 3 ||
1825 name[2] != ':' ||
1826 name[1] < '0' || '3' < name[1])
1827 cp = name + 1;
1828 else {
1829 stage = name[1] - '0';
1830 cp = name + 3;
5119602a 1831 }
0381f7f3 1832 new_path = resolve_relative_path(repo, cp);
3d6e0f74
JH
1833 if (!new_path) {
1834 namelen = namelen - (cp - name);
1835 } else {
1836 cp = new_path;
1837 namelen = strlen(cp);
1838 }
573285e5 1839
321c89bf 1840 if (flags & GET_OID_RECORD_PATH)
dc944b65 1841 oc->path = xstrdup(cp);
573285e5 1842
581d2fd9 1843 if (!repo->index || !repo->index->cache)
efe461b0 1844 repo_read_index(repo);
3a7a698e 1845 pos = index_name_pos(repo->index, cp, namelen);
73b0e5af
JH
1846 if (pos < 0)
1847 pos = -pos - 1;
3a7a698e
NTND
1848 while (pos < repo->index->cache_nr) {
1849 ce = repo->index->cache[pos];
73b0e5af
JH
1850 if (ce_namelen(ce) != namelen ||
1851 memcmp(ce->name, cp, namelen))
1852 break;
1853 if (ce_stage(ce) == stage) {
e82caf38 1854 oidcpy(oid, &ce->oid);
90064710 1855 oc->mode = ce->ce_mode;
979f7929 1856 free(new_path);
73b0e5af
JH
1857 return 0;
1858 }
e7cef45f 1859 pos++;
73b0e5af 1860 }
2e83b66c 1861 if (only_to_die && name[1] && name[1] != '/')
0488481e 1862 diagnose_invalid_index_path(repo, stage, prefix, cp);
979f7929 1863 free(new_path);
73b0e5af
JH
1864 return -1;
1865 }
cce91a2c
SP
1866 for (cp = name, bracket_depth = 0; *cp; cp++) {
1867 if (*cp == '{')
1868 bracket_depth++;
1869 else if (bracket_depth && *cp == '}')
1870 bracket_depth--;
1871 else if (!bracket_depth && *cp == ':')
1872 break;
1873 }
1874 if (*cp == ':') {
e82caf38 1875 struct object_id tree_oid;
b2981d06 1876 int len = cp - name;
8a10fea4
JK
1877 unsigned sub_flags = flags;
1878
321c89bf 1879 sub_flags &= ~GET_OID_DISAMBIGUATORS;
1880 sub_flags |= GET_OID_TREEISH;
8a10fea4 1881
2b1790f5 1882 if (!get_oid_1(repo, name, len, &tree_oid, sub_flags)) {
009fee47 1883 const char *filename = cp+1;
979f7929
NTND
1884 char *new_filename = NULL;
1885
0381f7f3 1886 new_filename = resolve_relative_path(repo, filename);
979f7929
NTND
1887 if (new_filename)
1888 filename = new_filename;
321c89bf 1889 if (flags & GET_OID_FOLLOW_SYMLINKS) {
0dd1f0c3 1890 ret = get_tree_entry_follow_symlinks(repo, &tree_oid,
3b683bcf 1891 filename, oid, &oc->symlink_path,
c4ec9677
DT
1892 &oc->mode);
1893 } else {
50ddb089 1894 ret = get_tree_entry(repo, &tree_oid, filename, oid,
916bc35b 1895 &oc->mode);
c4ec9677 1896 if (ret && only_to_die) {
50ddb089 1897 diagnose_invalid_oid_path(repo, prefix,
c4ec9677 1898 filename,
e82caf38 1899 &tree_oid,
c4ec9677
DT
1900 name, len);
1901 }
009fee47 1902 }
321c89bf 1903 if (flags & GET_OID_RECORD_PATH)
dc944b65 1904 oc->path = xstrdup(filename);
573285e5 1905
979f7929 1906 free(new_filename);
009fee47
MM
1907 return ret;
1908 } else {
2e83b66c 1909 if (only_to_die)
b0418303 1910 die(_("invalid object name '%.*s'."), len, name);
009fee47 1911 }
5119602a
LT
1912 }
1913 return ret;
9938af6a 1914}
f01cc14c 1915
8c135ea2
JH
1916/*
1917 * Call this function when you know "name" given by the end user must
1918 * name an object but it doesn't; the function _may_ die with a better
1919 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1920 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1921 * you have a chance to diagnose the error further.
1922 */
e270f42c
NTND
1923void maybe_die_on_misspelt_object_name(struct repository *r,
1924 const char *name,
1925 const char *prefix)
f01cc14c
JH
1926{
1927 struct object_context oc;
e82caf38 1928 struct object_id oid;
e270f42c 1929 get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE,
3a7a698e 1930 prefix, &oid, &oc);
8c135ea2
JH
1931}
1932
127b48f9
NTND
1933enum get_oid_result get_oid_with_context(struct repository *repo,
1934 const char *str,
1935 unsigned flags,
1936 struct object_id *oid,
1937 struct object_context *oc)
f01cc14c 1938{
321c89bf 1939 if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
033abf97 1940 BUG("incompatible flags for get_sha1_with_context");
3a7a698e 1941 return get_oid_with_context_1(repo, str, flags, NULL, oid, oc);
f01cc14c 1942}