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