sha1_name: check @{-N} errors sooner
[git/git.git] / sha1_name.c
CommitLineData
9938af6a 1#include "cache.h"
5385f52d 2#include "tag.h"
9938af6a 3#include "commit.h"
5385f52d
JH
4#include "tree.h"
5#include "blob.h"
f3ab49db 6#include "tree-walk.h"
d556fae2 7#include "refs.h"
28fb8438 8#include "remote.h"
9938af6a 9
32574b68
NTND
10static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
11
a78fafe7
JH
12typedef int (*disambiguate_hint_fn)(const unsigned char *, void *);
13
14struct disambiguate_state {
15 disambiguate_hint_fn fn;
16 void *cb_data;
17 unsigned char candidate[20];
18 unsigned candidate_exists:1;
19 unsigned candidate_checked:1;
20 unsigned candidate_ok:1;
21 unsigned disambiguate_fn_used:1;
22 unsigned ambiguous:1;
957d7406 23 unsigned always_call_fn:1;
a78fafe7
JH
24};
25
26static void update_candidates(struct disambiguate_state *ds, const unsigned char *current)
27{
957d7406
JH
28 if (ds->always_call_fn) {
29 ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;
30 return;
31 }
a78fafe7
JH
32 if (!ds->candidate_exists) {
33 /* this is the first candidate */
34 hashcpy(ds->candidate, current);
35 ds->candidate_exists = 1;
36 return;
37 } else if (!hashcmp(ds->candidate, current)) {
38 /* the same as what we already have seen */
39 return;
40 }
41
42 if (!ds->fn) {
43 /* cannot disambiguate between ds->candidate and current */
44 ds->ambiguous = 1;
45 return;
46 }
47
48 if (!ds->candidate_checked) {
49 ds->candidate_ok = ds->fn(ds->candidate, ds->cb_data);
50 ds->disambiguate_fn_used = 1;
51 ds->candidate_checked = 1;
52 }
53
54 if (!ds->candidate_ok) {
55 /* discard the candidate; we know it does not satisify fn */
56 hashcpy(ds->candidate, current);
57 ds->candidate_checked = 0;
58 return;
59 }
60
61 /* if we reach this point, we know ds->candidate satisfies fn */
62 if (ds->fn(current, ds->cb_data)) {
63 /*
64 * if both current and candidate satisfy fn, we cannot
65 * disambiguate.
66 */
67 ds->candidate_ok = 0;
68 ds->ambiguous = 1;
69 }
70
71 /* otherwise, current can be discarded and candidate is still good */
72}
73
74static void find_short_object_filename(int len, const char *hex_pfx, struct disambiguate_state *ds)
9938af6a 75{
99a19b43 76 struct alternate_object_database *alt;
9938af6a 77 char hex[40];
99a19b43
JH
78 static struct alternate_object_database *fakeent;
79
80 if (!fakeent) {
274ac009
JH
81 /*
82 * Create a "fake" alternate object database that
83 * points to our own object database, to make it
84 * easier to get a temporary working space in
85 * alt->name/alt->base while iterating over the
86 * object databases including our own.
87 */
99a19b43
JH
88 const char *objdir = get_object_directory();
89 int objdir_len = strlen(objdir);
90 int entlen = objdir_len + 43;
91 fakeent = xmalloc(sizeof(*fakeent) + entlen);
92 memcpy(fakeent->base, objdir, objdir_len);
93 fakeent->name = fakeent->base + objdir_len + 1;
94 fakeent->name[-1] = '/';
95 }
96 fakeent->next = alt_odb_list;
9938af6a 97
1703f9aa 98 sprintf(hex, "%.2s", hex_pfx);
a78fafe7 99 for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) {
9938af6a 100 struct dirent *de;
99a19b43 101 DIR *dir;
1703f9aa 102 sprintf(alt->name, "%.2s/", hex_pfx);
99a19b43
JH
103 dir = opendir(alt->base);
104 if (!dir)
105 continue;
a78fafe7
JH
106
107 while (!ds->ambiguous && (de = readdir(dir)) != NULL) {
108 unsigned char sha1[20];
109
9938af6a
JH
110 if (strlen(de->d_name) != 38)
111 continue;
1703f9aa 112 if (memcmp(de->d_name, hex_pfx + 2, len - 2))
9938af6a 113 continue;
a78fafe7
JH
114 memcpy(hex + 2, de->d_name, 38);
115 if (!get_sha1_hex(hex, sha1))
116 update_candidates(ds, sha1);
9938af6a
JH
117 }
118 closedir(dir);
119 }
9938af6a
JH
120}
121
122static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
123{
124 do {
125 if (*a != *b)
126 return 0;
127 a++;
128 b++;
129 len -= 2;
130 } while (len > 1);
131 if (len)
132 if ((*a ^ *b) & 0xf0)
133 return 0;
134 return 1;
135}
136
a78fafe7 137static void unique_in_pack(int len,
1703f9aa 138 const unsigned char *bin_pfx,
a78fafe7
JH
139 struct packed_git *p,
140 struct disambiguate_state *ds)
9938af6a 141{
f703e6ea
JH
142 uint32_t num, last, i, first = 0;
143 const unsigned char *current = NULL;
144
145 open_pack_index(p);
146 num = p->num_objects;
147 last = num;
148 while (first < last) {
149 uint32_t mid = (first + last) / 2;
150 const unsigned char *current;
151 int cmp;
152
153 current = nth_packed_object_sha1(p, mid);
1703f9aa 154 cmp = hashcmp(bin_pfx, current);
f703e6ea
JH
155 if (!cmp) {
156 first = mid;
157 break;
9938af6a 158 }
f703e6ea
JH
159 if (cmp > 0) {
160 first = mid+1;
161 continue;
9938af6a 162 }
f703e6ea
JH
163 last = mid;
164 }
165
166 /*
167 * At this point, "first" is the location of the lowest object
1703f9aa 168 * with an object name that could match "bin_pfx". See if we have
f703e6ea
JH
169 * 0, 1 or more objects that actually match(es).
170 */
a78fafe7
JH
171 for (i = first; i < num && !ds->ambiguous; i++) {
172 current = nth_packed_object_sha1(p, i);
1703f9aa 173 if (!match_sha(len, bin_pfx, current))
f703e6ea 174 break;
a78fafe7 175 update_candidates(ds, current);
9938af6a 176 }
f703e6ea
JH
177}
178
a78fafe7
JH
179static void find_short_packed_object(int len, const unsigned char *bin_pfx,
180 struct disambiguate_state *ds)
9938af6a
JH
181{
182 struct packed_git *p;
183
184 prepare_packed_git();
a78fafe7
JH
185 for (p = packed_git; p && !ds->ambiguous; p = p->next)
186 unique_in_pack(len, bin_pfx, p, ds);
99a19b43
JH
187}
188
013f276e
JH
189#define SHORT_NAME_NOT_FOUND (-1)
190#define SHORT_NAME_AMBIGUOUS (-2)
191
a78fafe7
JH
192static int finish_object_disambiguation(struct disambiguate_state *ds,
193 unsigned char *sha1)
99a19b43 194{
a78fafe7
JH
195 if (ds->ambiguous)
196 return SHORT_NAME_AMBIGUOUS;
99a19b43 197
a78fafe7 198 if (!ds->candidate_exists)
013f276e 199 return SHORT_NAME_NOT_FOUND;
a78fafe7
JH
200
201 if (!ds->candidate_checked)
202 /*
203 * If this is the only candidate, there is no point
204 * calling the disambiguation hint callback.
205 *
206 * On the other hand, if the current candidate
207 * replaced an earlier candidate that did _not_ pass
208 * the disambiguation hint callback, then we do have
209 * more than one objects that match the short name
210 * given, so we should make sure this one matches;
211 * otherwise, if we discovered this one and the one
212 * that we previously discarded in the reverse order,
213 * we would end up showing different results in the
214 * same repository!
215 */
216 ds->candidate_ok = (!ds->disambiguate_fn_used ||
217 ds->fn(ds->candidate, ds->cb_data));
218
219 if (!ds->candidate_ok)
013f276e 220 return SHORT_NAME_AMBIGUOUS;
a78fafe7
JH
221
222 hashcpy(sha1, ds->candidate);
9938af6a
JH
223 return 0;
224}
225
aa1dec9e
JH
226static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused)
227{
228 int kind = sha1_object_info(sha1, NULL);
229 return kind == OBJ_COMMIT;
230}
231
e2643617
JH
232static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data_unused)
233{
234 struct object *obj;
235 int kind;
236
237 kind = sha1_object_info(sha1, NULL);
238 if (kind == OBJ_COMMIT)
239 return 1;
240 if (kind != OBJ_TAG)
99a19b43 241 return 0;
e2643617
JH
242
243 /* We need to do this the hard way... */
244 obj = deref_tag(lookup_object(sha1), NULL, 0);
245 if (obj && obj->type == OBJ_COMMIT)
246 return 1;
9938af6a
JH
247 return 0;
248}
249
daba53ae 250static int disambiguate_tree_only(const unsigned char *sha1, void *cb_data_unused)
9938af6a 251{
daba53ae
JH
252 int kind = sha1_object_info(sha1, NULL);
253 return kind == OBJ_TREE;
254}
9938af6a 255
daba53ae
JH
256static int disambiguate_treeish_only(const unsigned char *sha1, void *cb_data_unused)
257{
258 struct object *obj;
259 int kind;
260
261 kind = sha1_object_info(sha1, NULL);
262 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
263 return 1;
264 if (kind != OBJ_TAG)
265 return 0;
266
267 /* We need to do this the hard way... */
268 obj = deref_tag(lookup_object(sha1), NULL, 0);
269 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
270 return 1;
271 return 0;
272}
273
274static int disambiguate_blob_only(const unsigned char *sha1, void *cb_data_unused)
275{
276 int kind = sha1_object_info(sha1, NULL);
277 return kind == OBJ_BLOB;
278}
279
957d7406
JH
280static int prepare_prefixes(const char *name, int len,
281 unsigned char *bin_pfx,
282 char *hex_pfx)
9938af6a 283{
957d7406 284 int i;
9938af6a 285
1703f9aa
JH
286 hashclr(bin_pfx);
287 memset(hex_pfx, 'x', 40);
af61c6e0 288 for (i = 0; i < len ;i++) {
9938af6a
JH
289 unsigned char c = name[i];
290 unsigned char val;
9938af6a
JH
291 if (c >= '0' && c <= '9')
292 val = c - '0';
293 else if (c >= 'a' && c <= 'f')
294 val = c - 'a' + 10;
295 else if (c >= 'A' && c <='F') {
296 val = c - 'A' + 10;
297 c -= 'A' - 'a';
298 }
299 else
300 return -1;
1703f9aa 301 hex_pfx[i] = c;
9938af6a
JH
302 if (!(i & 1))
303 val <<= 4;
1703f9aa 304 bin_pfx[i >> 1] |= val;
9938af6a 305 }
957d7406
JH
306 return 0;
307}
308
309static int get_short_sha1(const char *name, int len, unsigned char *sha1,
310 unsigned flags)
311{
312 int status;
313 char hex_pfx[40];
314 unsigned char bin_pfx[20];
315 struct disambiguate_state ds;
316 int quietly = !!(flags & GET_SHA1_QUIETLY);
317
318 if (len < MINIMUM_ABBREV || len > 40)
319 return -1;
320 if (prepare_prefixes(name, len, bin_pfx, hex_pfx) < 0)
321 return -1;
99a19b43 322
a78fafe7
JH
323 prepare_alt_odb();
324
325 memset(&ds, 0, sizeof(ds));
aa1dec9e
JH
326 if (flags & GET_SHA1_COMMIT)
327 ds.fn = disambiguate_commit_only;
e2643617
JH
328 else if (flags & GET_SHA1_COMMITTISH)
329 ds.fn = disambiguate_committish_only;
daba53ae
JH
330 else if (flags & GET_SHA1_TREE)
331 ds.fn = disambiguate_tree_only;
332 else if (flags & GET_SHA1_TREEISH)
333 ds.fn = disambiguate_treeish_only;
334 else if (flags & GET_SHA1_BLOB)
335 ds.fn = disambiguate_blob_only;
aa1dec9e 336
a78fafe7
JH
337 find_short_object_filename(len, hex_pfx, &ds);
338 find_short_packed_object(len, bin_pfx, &ds);
339 status = finish_object_disambiguation(&ds, sha1);
99a19b43 340
013f276e 341 if (!quietly && (status == SHORT_NAME_AMBIGUOUS))
1703f9aa 342 return error("short SHA1 %.*s is ambiguous.", len, hex_pfx);
013f276e
JH
343 return status;
344}
345
957d7406
JH
346
347int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
348{
349 char hex_pfx[40];
350 unsigned char bin_pfx[20];
351 struct disambiguate_state ds;
352 int len = strlen(prefix);
353
354 if (len < MINIMUM_ABBREV || len > 40)
355 return -1;
356 if (prepare_prefixes(prefix, len, bin_pfx, hex_pfx) < 0)
357 return -1;
358
359 prepare_alt_odb();
360
361 memset(&ds, 0, sizeof(ds));
362 ds.always_call_fn = 1;
363 ds.cb_data = cb_data;
364 ds.fn = fn;
365
366 find_short_object_filename(len, hex_pfx, &ds);
367 find_short_packed_object(len, bin_pfx, &ds);
368 return ds.ambiguous;
369}
370
013f276e
JH
371const char *find_unique_abbrev(const unsigned char *sha1, int len)
372{
b66fde9a 373 int status, exists;
013f276e 374 static char hex[41];
47dd0d59 375
b66fde9a 376 exists = has_sha1_file(sha1);
013f276e 377 memcpy(hex, sha1_to_hex(sha1), 40);
02c5cba2 378 if (len == 40 || !len)
47dd0d59 379 return hex;
013f276e
JH
380 while (len < 40) {
381 unsigned char sha1_ret[20];
37c00e55 382 status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
b66fde9a
JH
383 if (exists
384 ? !status
385 : status == SHORT_NAME_NOT_FOUND) {
ea2c69ed 386 hex[len] = 0;
013f276e
JH
387 return hex;
388 }
013f276e
JH
389 len++;
390 }
b66fde9a 391 return hex;
9938af6a
JH
392}
393
6677c466 394static int ambiguous_path(const char *path, int len)
af13cdf2
LT
395{
396 int slash = 1;
6677c466 397 int cnt;
af13cdf2 398
6677c466 399 for (cnt = 0; cnt < len; cnt++) {
af13cdf2
LT
400 switch (*path++) {
401 case '\0':
402 break;
403 case '/':
404 if (slash)
405 break;
406 slash = 1;
407 continue;
408 case '.':
409 continue;
410 default:
411 slash = 0;
412 continue;
413 }
c054d64e 414 break;
af13cdf2 415 }
6677c466 416 return slash;
af13cdf2
LT
417}
418
ae0ba8e2
JH
419static inline int upstream_mark(const char *string, int len)
420{
421 const char *suffix[] = { "@{upstream}", "@{u}" };
422 int i;
423
424 for (i = 0; i < ARRAY_SIZE(suffix); i++) {
425 int suffix_len = strlen(suffix[i]);
426 if (suffix_len <= len
427 && !memcmp(string, suffix[i], suffix_len))
428 return suffix_len;
429 }
430 return 0;
431}
432
e48ba200 433static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
128fd54d 434static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf);
d18ba221 435
e86eb666
JH
436static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
437{
eedce784 438 static const char *warn_msg = "refname '%.*s' is ambiguous.";
ed378ec7 439 char *real_ref = NULL;
ab2a1a32 440 int refs_found = 0;
128fd54d 441 int at, reflog_len, nth_prior = 0;
9938af6a 442
3c3852e3 443 if (len == 40 && !get_sha1_hex(str, sha1))
9938af6a
JH
444 return 0;
445
d18ba221 446 /* basic@{time or number or -number} format to query ref-log */
694500ed 447 reflog_len = at = 0;
f265458f 448 if (len && str[len-1] == '}') {
e883a057 449 for (at = len-4; at >= 0; at--) {
ab2a1a32 450 if (str[at] == '@' && str[at+1] == '{') {
83d16bc7
RR
451 if (str[at+2] == '-') {
452 if (at != 0)
453 /* @{-N} not at start */
454 return -1;
128fd54d
FC
455 nth_prior = 1;
456 continue;
457 }
ae0ba8e2 458 if (!upstream_mark(str + at, len - at)) {
28fb8438
JS
459 reflog_len = (len-1) - (at+2);
460 len = at;
461 }
ab2a1a32
JH
462 break;
463 }
d556fae2
SP
464 }
465 }
466
af13cdf2 467 /* Accept only unambiguous ref paths. */
11cf8801 468 if (len && ambiguous_path(str, len))
af13cdf2
LT
469 return -1;
470
128fd54d 471 if (nth_prior) {
d18ba221 472 struct strbuf buf = STRBUF_INIT;
128fd54d
FC
473 int detached;
474
475 if (interpret_nth_prior_checkout(str, &buf) > 0) {
476 detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
477 strbuf_release(&buf);
478 if (detached)
479 return 0;
480 }
481 }
482
483 if (!len && reflog_len)
11cf8801
NP
484 /* allow "@{...}" to mean the current branch reflog */
485 refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
128fd54d 486 else if (reflog_len)
f2eba66d
NP
487 refs_found = dwim_log(str, len, sha1, &real_ref);
488 else
11cf8801 489 refs_found = dwim_ref(str, len, sha1, &real_ref);
d556fae2
SP
490
491 if (!refs_found)
492 return -1;
493
494 if (warn_ambiguous_refs && refs_found > 1)
eedce784 495 warning(warn_msg, len, str);
d556fae2 496
ab2a1a32 497 if (reflog_len) {
ab2a1a32
JH
498 int nth, i;
499 unsigned long at_time;
16d7cc90
JH
500 unsigned long co_time;
501 int co_tz, co_cnt;
502
fe558516 503 /* Is it asking for N-th entry, or approxidate? */
ab2a1a32
JH
504 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
505 char ch = str[at+2+i];
506 if ('0' <= ch && ch <= '9')
507 nth = nth * 10 + ch - '0';
508 else
509 nth = -1;
510 }
ea360dd0
SP
511 if (100000000 <= nth) {
512 at_time = nth;
513 nth = -1;
514 } else if (0 <= nth)
ab2a1a32 515 at_time = 0;
861f00e3 516 else {
93cfa7c7 517 int errors = 0;
861f00e3 518 char *tmp = xstrndup(str + at + 2, reflog_len);
93cfa7c7 519 at_time = approxidate_careful(tmp, &errors);
861f00e3 520 free(tmp);
a5e10acb
JH
521 if (errors)
522 return -1;
861f00e3 523 }
16d7cc90
JH
524 if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
525 &co_time, &co_tz, &co_cnt)) {
526 if (at_time)
eedce784
JS
527 warning("Log for '%.*s' only goes "
528 "back to %s.", len, str,
73013afd 529 show_date(co_time, co_tz, DATE_RFC2822));
e6eedc31
JS
530 else {
531 free(real_ref);
532 die("Log for '%.*s' only has %d entries.",
533 len, str, co_cnt);
534 }
16d7cc90 535 }
d556fae2
SP
536 }
537
ed378ec7 538 free(real_ref);
d556fae2 539 return 0;
9938af6a
JH
540}
541
9938af6a
JH
542static int get_parent(const char *name, int len,
543 unsigned char *result, int idx)
544{
545 unsigned char sha1[20];
e2643617 546 int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
9938af6a
JH
547 struct commit *commit;
548 struct commit_list *p;
549
550 if (ret)
551 return ret;
552 commit = lookup_commit_reference(sha1);
553 if (!commit)
554 return -1;
555 if (parse_commit(commit))
556 return -1;
557 if (!idx) {
e702496e 558 hashcpy(result, commit->object.sha1);
9938af6a
JH
559 return 0;
560 }
561 p = commit->parents;
562 while (p) {
563 if (!--idx) {
e702496e 564 hashcpy(result, p->item->object.sha1);
9938af6a
JH
565 return 0;
566 }
567 p = p->next;
568 }
569 return -1;
570}
571
4f7599ac
JH
572static int get_nth_ancestor(const char *name, int len,
573 unsigned char *result, int generation)
574{
575 unsigned char sha1[20];
621ff675
LT
576 struct commit *commit;
577 int ret;
578
e2643617 579 ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
4f7599ac
JH
580 if (ret)
581 return ret;
621ff675
LT
582 commit = lookup_commit_reference(sha1);
583 if (!commit)
584 return -1;
4f7599ac
JH
585
586 while (generation--) {
621ff675 587 if (parse_commit(commit) || !commit->parents)
4f7599ac 588 return -1;
621ff675 589 commit = commit->parents->item;
4f7599ac 590 }
621ff675 591 hashcpy(result, commit->object.sha1);
4f7599ac
JH
592 return 0;
593}
594
81776315
JH
595struct object *peel_to_type(const char *name, int namelen,
596 struct object *o, enum object_type expected_type)
597{
598 if (name && !namelen)
599 namelen = strlen(name);
81776315
JH
600 while (1) {
601 if (!o || (!o->parsed && !parse_object(o->sha1)))
602 return NULL;
a6a3f2cc 603 if (expected_type == OBJ_ANY || o->type == expected_type)
81776315
JH
604 return o;
605 if (o->type == OBJ_TAG)
606 o = ((struct tag*) o)->tagged;
607 else if (o->type == OBJ_COMMIT)
608 o = &(((struct commit *) o)->tree->object);
609 else {
610 if (name)
611 error("%.*s: expected %s type, but the object "
612 "dereferences to %s type",
613 namelen, name, typename(expected_type),
614 typename(o->type));
615 return NULL;
616 }
617 }
618}
619
5385f52d
JH
620static int peel_onion(const char *name, int len, unsigned char *sha1)
621{
622 unsigned char outer[20];
623 const char *sp;
885a86ab 624 unsigned int expected_type = 0;
e2643617 625 unsigned lookup_flags = 0;
5385f52d
JH
626 struct object *o;
627
628 /*
629 * "ref^{type}" dereferences ref repeatedly until you cannot
630 * dereference anymore, or you get an object of given type,
631 * whichever comes first. "ref^{}" means just dereference
632 * tags until you get a non-tag. "ref^0" is a shorthand for
633 * "ref^{commit}". "commit^{tree}" could be used to find the
634 * top-level tree of the given commit.
635 */
636 if (len < 4 || name[len-1] != '}')
637 return -1;
638
639 for (sp = name + len - 1; name <= sp; sp--) {
640 int ch = *sp;
641 if (ch == '{' && name < sp && sp[-1] == '^')
642 break;
643 }
644 if (sp <= name)
645 return -1;
646
647 sp++; /* beginning of type name, or closing brace for empty */
648 if (!strncmp(commit_type, sp, 6) && sp[6] == '}')
1974632c 649 expected_type = OBJ_COMMIT;
5385f52d 650 else if (!strncmp(tree_type, sp, 4) && sp[4] == '}')
1974632c 651 expected_type = OBJ_TREE;
5385f52d 652 else if (!strncmp(blob_type, sp, 4) && sp[4] == '}')
1974632c 653 expected_type = OBJ_BLOB;
a6a3f2cc
JH
654 else if (!prefixcmp(sp, "object}"))
655 expected_type = OBJ_ANY;
5385f52d 656 else if (sp[0] == '}')
1974632c 657 expected_type = OBJ_NONE;
32574b68
NTND
658 else if (sp[0] == '/')
659 expected_type = OBJ_COMMIT;
5385f52d
JH
660 else
661 return -1;
662
e2643617
JH
663 if (expected_type == OBJ_COMMIT)
664 lookup_flags = GET_SHA1_COMMITTISH;
ed1ca602
JH
665 else if (expected_type == OBJ_TREE)
666 lookup_flags = GET_SHA1_TREEISH;
e2643617
JH
667
668 if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
5385f52d
JH
669 return -1;
670
671 o = parse_object(outer);
672 if (!o)
673 return -1;
885a86ab 674 if (!expected_type) {
9534f40b 675 o = deref_tag(o, name, sp - name - 2);
6e1c6c10
JH
676 if (!o || (!o->parsed && !parse_object(o->sha1)))
677 return -1;
e702496e 678 hashcpy(sha1, o->sha1);
32574b68 679 return 0;
5385f52d 680 }
32574b68
NTND
681
682 /*
683 * At this point, the syntax look correct, so
684 * if we do not get the needed object, we should
685 * barf.
686 */
687 o = peel_to_type(name, len, o, expected_type);
688 if (!o)
81776315 689 return -1;
32574b68
NTND
690
691 hashcpy(sha1, o->sha1);
692 if (sp[0] == '/') {
693 /* "$commit^{/foo}" */
694 char *prefix;
695 int ret;
696 struct commit_list *list = NULL;
697
81776315 698 /*
4322842a
NTND
699 * $commit^{/}. Some regex implementation may reject.
700 * We don't need regex anyway. '' pattern always matches.
5385f52d 701 */
4322842a 702 if (sp[1] == '}')
81776315 703 return 0;
4322842a 704
32574b68
NTND
705 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
706 commit_list_insert((struct commit *)o, &list);
707 ret = get_sha1_oneline(prefix, sha1, list);
708 free(prefix);
709 return ret;
5385f52d
JH
710 }
711 return 0;
712}
713
7dd45e15
JH
714static int get_describe_name(const char *name, int len, unsigned char *sha1)
715{
716 const char *cp;
6269b6b6 717 unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
7dd45e15
JH
718
719 for (cp = name + len - 1; name + 2 <= cp; cp--) {
720 char ch = *cp;
721 if (hexval(ch) & ~0377) {
722 /* We must be looking at g in "SOMETHING-g"
723 * for it to be describe output.
724 */
725 if (ch == 'g' && cp[-1] == '-') {
726 cp++;
727 len -= cp - name;
6269b6b6 728 return get_short_sha1(cp, len, sha1, flags);
7dd45e15
JH
729 }
730 }
731 }
732 return -1;
733}
734
e48ba200 735static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
9938af6a 736{
0601dbe1 737 int ret, has_suffix;
4f7599ac 738 const char *cp;
9938af6a 739
621ff675
LT
740 /*
741 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
4f7599ac 742 */
0601dbe1 743 has_suffix = 0;
4f7599ac
JH
744 for (cp = name + len - 1; name <= cp; cp--) {
745 int ch = *cp;
746 if ('0' <= ch && ch <= '9')
747 continue;
0601dbe1
JH
748 if (ch == '~' || ch == '^')
749 has_suffix = ch;
4f7599ac
JH
750 break;
751 }
0601dbe1
JH
752
753 if (has_suffix) {
754 int num = 0;
4f7599ac
JH
755 int len1 = cp - name;
756 cp++;
757 while (cp < name + len)
0601dbe1 758 num = num * 10 + *cp++ - '0';
621ff675
LT
759 if (!num && len1 == len - 1)
760 num = 1;
761 if (has_suffix == '^')
0601dbe1 762 return get_parent(name, len1, sha1, num);
0601dbe1
JH
763 /* else if (has_suffix == '~') -- goes without saying */
764 return get_nth_ancestor(name, len1, sha1, num);
4f7599ac
JH
765 }
766
5385f52d
JH
767 ret = peel_onion(name, len, sha1);
768 if (!ret)
769 return 0;
770
9938af6a
JH
771 ret = get_sha1_basic(name, len, sha1);
772 if (!ret)
773 return 0;
7dd45e15
JH
774
775 /* It could be describe output that is "SOMETHING-gXXXX" */
776 ret = get_describe_name(name, len, sha1);
777 if (!ret)
778 return 0;
779
e2643617 780 return get_short_sha1(name, len, sha1, lookup_flags);
9938af6a
JH
781}
782
f7bff003
JH
783/*
784 * This interprets names like ':/Initial revision of "git"' by searching
785 * through history and returning the first commit whose message starts
3d045897 786 * the given regular expression.
f7bff003
JH
787 *
788 * For future extension, ':/!' is reserved. If you want to match a message
789 * beginning with a '!', you have to repeat the exclamation mark.
790 */
791#define ONELINE_SEEN (1u<<20)
792
28a4d940
JS
793static int handle_one_ref(const char *path,
794 const unsigned char *sha1, int flag, void *cb_data)
795{
796 struct commit_list **list = cb_data;
797 struct object *object = parse_object(sha1);
798 if (!object)
799 return 0;
affeef12 800 if (object->type == OBJ_TAG) {
28a4d940 801 object = deref_tag(object, path, strlen(path));
affeef12
MK
802 if (!object)
803 return 0;
804 }
28a4d940
JS
805 if (object->type != OBJ_COMMIT)
806 return 0;
47e44ed1 807 commit_list_insert_by_date((struct commit *)object, list);
28a4d940
JS
808 return 0;
809}
810
84baa31b
NTND
811static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
812 struct commit_list *list)
28a4d940 813{
84baa31b 814 struct commit_list *backup = NULL, *l;
28042dbc 815 int found = 0;
57895105 816 regex_t regex;
28a4d940
JS
817
818 if (prefix[0] == '!') {
819 if (prefix[1] != '!')
820 die ("Invalid search pattern: %s", prefix);
821 prefix++;
822 }
57895105
LT
823
824 if (regcomp(&regex, prefix, REG_EXTENDED))
825 die("Invalid search pattern: %s", prefix);
826
84baa31b
NTND
827 for (l = list; l; l = l->next) {
828 l->item->object.flags |= ONELINE_SEEN;
28a4d940 829 commit_list_insert(l->item, &backup);
84baa31b 830 }
ed8ad7e2 831 while (list) {
28042dbc 832 char *p, *to_free = NULL;
1358e7d6 833 struct commit *commit;
364d3e65
JS
834 enum object_type type;
835 unsigned long size;
28042dbc 836 int matches;
ed8ad7e2
JM
837
838 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
283cdbcf
MK
839 if (!parse_object(commit->object.sha1))
840 continue;
364d3e65
JS
841 if (commit->buffer)
842 p = commit->buffer;
843 else {
844 p = read_sha1_file(commit->object.sha1, &type, &size);
845 if (!p)
846 continue;
28042dbc 847 to_free = p;
364d3e65 848 }
28042dbc
JH
849
850 p = strstr(p, "\n\n");
851 matches = p && !regexec(&regex, p + 2, 0, NULL, 0);
852 free(to_free);
853
854 if (matches) {
28a4d940 855 hashcpy(sha1, commit->object.sha1);
28042dbc 856 found = 1;
28a4d940
JS
857 break;
858 }
859 }
57895105 860 regfree(&regex);
28a4d940
JS
861 free_commit_list(list);
862 for (l = backup; l; l = l->next)
863 clear_commit_marks(l->item, ONELINE_SEEN);
28042dbc
JH
864 free_commit_list(backup);
865 return found ? 0 : -1;
28a4d940
JS
866}
867
ae5a6c36 868struct grab_nth_branch_switch_cbdata {
98f85ff4
JH
869 int remaining;
870 struct strbuf buf;
ae5a6c36
JH
871};
872
873static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
874 const char *email, unsigned long timestamp, int tz,
875 const char *message, void *cb_data)
876{
877 struct grab_nth_branch_switch_cbdata *cb = cb_data;
a884d0cb
TR
878 const char *match = NULL, *target = NULL;
879 size_t len;
880
881 if (!prefixcmp(message, "checkout: moving from ")) {
882 match = message + strlen("checkout: moving from ");
d7c03c1f 883 target = strstr(match, " to ");
ae5a6c36
JH
884 }
885
c829774c 886 if (!match || !target)
ae5a6c36 887 return 0;
98f85ff4
JH
888 if (--(cb->remaining) == 0) {
889 len = target - match;
890 strbuf_reset(&cb->buf);
891 strbuf_add(&cb->buf, match, len);
892 return 1; /* we are done */
893 }
ae5a6c36
JH
894 return 0;
895}
896
897/*
ae0ba8e2
JH
898 * Parse @{-N} syntax, return the number of characters parsed
899 * if successful; otherwise signal an error with negative value.
ae5a6c36 900 */
ae0ba8e2 901static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf)
ae5a6c36 902{
c2883e62 903 long nth;
98f85ff4 904 int retval;
ae5a6c36 905 struct grab_nth_branch_switch_cbdata cb;
a884d0cb
TR
906 const char *brace;
907 char *num_end;
ae5a6c36
JH
908
909 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
910 return -1;
a884d0cb
TR
911 brace = strchr(name, '}');
912 if (!brace)
913 return -1;
98f85ff4 914 nth = strtol(name + 3, &num_end, 10);
a884d0cb 915 if (num_end != brace)
ae5a6c36 916 return -1;
c2883e62
JH
917 if (nth <= 0)
918 return -1;
98f85ff4
JH
919 cb.remaining = nth;
920 strbuf_init(&cb.buf, 20);
921
39765e59 922 retval = 0;
98f85ff4
JH
923 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
924 strbuf_reset(buf);
925 strbuf_add(buf, cb.buf.buf, cb.buf.len);
926 retval = brace - name + 1;
927 }
a884d0cb 928
98f85ff4 929 strbuf_release(&cb.buf);
39765e59 930 return retval;
ae5a6c36
JH
931}
932
619a644d
JH
933int get_sha1_mb(const char *name, unsigned char *sha1)
934{
935 struct commit *one, *two;
936 struct commit_list *mbs;
937 unsigned char sha1_tmp[20];
938 const char *dots;
939 int st;
940
941 dots = strstr(name, "...");
942 if (!dots)
943 return get_sha1(name, sha1);
944 if (dots == name)
945 st = get_sha1("HEAD", sha1_tmp);
946 else {
947 struct strbuf sb;
948 strbuf_init(&sb, dots - name);
949 strbuf_add(&sb, name, dots - name);
cd74e473 950 st = get_sha1_committish(sb.buf, sha1_tmp);
619a644d
JH
951 strbuf_release(&sb);
952 }
953 if (st)
954 return st;
955 one = lookup_commit_reference_gently(sha1_tmp, 0);
956 if (!one)
957 return -1;
958
cd74e473 959 if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", sha1_tmp))
619a644d
JH
960 return -1;
961 two = lookup_commit_reference_gently(sha1_tmp, 0);
962 if (!two)
963 return -1;
964 mbs = get_merge_bases(one, two, 1);
965 if (!mbs || mbs->next)
966 st = -1;
967 else {
968 st = 0;
969 hashcpy(sha1, mbs->item->object.sha1);
970 }
971 free_commit_list(mbs);
972 return st;
973}
974
ae0ba8e2
JH
975/*
976 * This reads short-hand syntax that not only evaluates to a commit
977 * object name, but also can act as if the end user spelled the name
978 * of the branch from the command line.
979 *
980 * - "@{-N}" finds the name of the Nth previous branch we were on, and
981 * places the name of the branch in the given buf and returns the
982 * number of characters parsed if successful.
983 *
984 * - "<branch>@{upstream}" finds the name of the other ref that
985 * <branch> is configured to merge with (missing <branch> defaults
986 * to the current branch), and places the name of the branch in the
987 * given buf and returns the number of characters parsed if
988 * successful.
989 *
990 * If the input is not of the accepted format, it returns a negative
991 * number to signal an error.
992 *
993 * If the input was ok but there are not N branch switches in the
994 * reflog, it returns 0.
995 */
996int interpret_branch_name(const char *name, struct strbuf *buf)
997{
998 char *cp;
999 struct branch *upstream;
1000 int namelen = strlen(name);
1001 int len = interpret_nth_prior_checkout(name, buf);
1002 int tmp_len;
1003
1004 if (!len)
1005 return len; /* syntax Ok, not enough switches */
d46a8301
JK
1006 if (0 < len && len == namelen)
1007 return len; /* consumed all */
1008 else if (0 < len) {
1009 /* we have extra data, which might need further processing */
1010 struct strbuf tmp = STRBUF_INIT;
1011 int used = buf->len;
1012 int ret;
1013
1014 strbuf_add(buf, name + len, namelen - len);
1015 ret = interpret_branch_name(buf->buf, &tmp);
1016 /* that data was not interpreted, remove our cruft */
1017 if (ret < 0) {
1018 strbuf_setlen(buf, used);
1019 return len;
1020 }
1021 strbuf_reset(buf);
1022 strbuf_addbuf(buf, &tmp);
1023 strbuf_release(&tmp);
1024 /* tweak for size of {-N} versus expanded ref name */
1025 return ret - used + len;
1026 }
1027
ae0ba8e2
JH
1028 cp = strchr(name, '@');
1029 if (!cp)
1030 return -1;
1031 tmp_len = upstream_mark(cp, namelen - (cp - name));
1032 if (!tmp_len)
1033 return -1;
1034 len = cp + tmp_len - name;
1035 cp = xstrndup(name, cp - name);
1036 upstream = branch_get(*cp ? cp : NULL);
9884e67f
ZJS
1037 /*
1038 * Upstream can be NULL only if cp refers to HEAD and HEAD
1039 * points to something different than a branch.
1040 */
1041 if (!upstream)
64720288 1042 return error(_("HEAD does not point to a branch"));
bb0dab5d
ZJS
1043 if (!upstream->merge || !upstream->merge[0]->dst) {
1044 if (!ref_exists(upstream->refname))
64720288 1045 return error(_("No such branch: '%s'"), cp);
17c82211 1046 if (!upstream->merge)
64720288 1047 return error(_("No upstream configured for branch '%s'"),
17c82211
ZJS
1048 upstream->name);
1049 return error(
64720288 1050 _("Upstream branch '%s' not stored as a remote-tracking branch"),
17c82211 1051 upstream->merge[0]->src);
bb0dab5d 1052 }
ae0ba8e2
JH
1053 free(cp);
1054 cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0);
1055 strbuf_reset(buf);
1056 strbuf_addstr(buf, cp);
1057 free(cp);
1058 return len;
1059}
1060
6bab74e7
JN
1061int strbuf_branchname(struct strbuf *sb, const char *name)
1062{
1063 int len = strlen(name);
1064 if (interpret_branch_name(name, sb) == len)
1065 return 0;
1066 strbuf_add(sb, name, len);
1067 return len;
1068}
1069
1070int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1071{
1072 strbuf_branchname(sb, name);
1073 if (name[0] == '-')
8d9c5010 1074 return -1;
6bab74e7 1075 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
8d9c5010 1076 return check_refname_format(sb->buf, 0);
6bab74e7
JN
1077}
1078
9938af6a
JH
1079/*
1080 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1081 * notably "xyz^" for "parent of xyz"
1082 */
1083int get_sha1(const char *name, unsigned char *sha1)
1084{
573285e5 1085 struct object_context unused;
33bd598c 1086 return get_sha1_with_context(name, 0, sha1, &unused);
a0cd87a5
MK
1087}
1088
cd74e473
JH
1089/*
1090 * Many callers know that the user meant to name a committish by
1091 * syntactical positions where the object name appears. Calling this
1092 * function allows the machinery to disambiguate shorter-than-unique
1093 * abbreviated object names between committish and others.
1094 *
1095 * Note that this does NOT error out when the named object is not a
1096 * committish. It is merely to give a hint to the disambiguation
1097 * machinery.
1098 */
1099int get_sha1_committish(const char *name, unsigned char *sha1)
1100{
1101 struct object_context unused;
1102 return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
1103 sha1, &unused);
1104}
1105
daba53ae
JH
1106int get_sha1_treeish(const char *name, unsigned char *sha1)
1107{
1108 struct object_context unused;
1109 return get_sha1_with_context(name, GET_SHA1_TREEISH,
1110 sha1, &unused);
1111}
1112
1113int get_sha1_commit(const char *name, unsigned char *sha1)
1114{
1115 struct object_context unused;
1116 return get_sha1_with_context(name, GET_SHA1_COMMIT,
1117 sha1, &unused);
1118}
1119
1120int get_sha1_tree(const char *name, unsigned char *sha1)
1121{
1122 struct object_context unused;
1123 return get_sha1_with_context(name, GET_SHA1_TREE,
1124 sha1, &unused);
1125}
1126
1127int get_sha1_blob(const char *name, unsigned char *sha1)
1128{
1129 struct object_context unused;
1130 return get_sha1_with_context(name, GET_SHA1_BLOB,
1131 sha1, &unused);
a0cd87a5
MK
1132}
1133
009fee47
MM
1134/* Must be called only when object_name:filename doesn't exist. */
1135static void diagnose_invalid_sha1_path(const char *prefix,
1136 const char *filename,
1137 const unsigned char *tree_sha1,
b2981d06
RS
1138 const char *object_name,
1139 int object_name_len)
009fee47
MM
1140{
1141 struct stat st;
1142 unsigned char sha1[20];
1143 unsigned mode;
1144
1145 if (!prefix)
1146 prefix = "";
1147
1148 if (!lstat(filename, &st))
b2981d06
RS
1149 die("Path '%s' exists on disk, but not in '%.*s'.",
1150 filename, object_name_len, object_name);
009fee47
MM
1151 if (errno == ENOENT || errno == ENOTDIR) {
1152 char *fullname = xmalloc(strlen(filename)
1153 + strlen(prefix) + 1);
1154 strcpy(fullname, prefix);
1155 strcat(fullname, filename);
1156
1157 if (!get_tree_entry(tree_sha1, fullname,
1158 sha1, &mode)) {
1159 die("Path '%s' exists, but not '%s'.\n"
b2981d06 1160 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
009fee47
MM
1161 fullname,
1162 filename,
b2981d06 1163 object_name_len, object_name,
e41d718c 1164 fullname,
b2981d06 1165 object_name_len, object_name,
e41d718c 1166 filename);
009fee47 1167 }
b2981d06
RS
1168 die("Path '%s' does not exist in '%.*s'",
1169 filename, object_name_len, object_name);
009fee47
MM
1170 }
1171}
1172
1173/* Must be called only when :stage:filename doesn't exist. */
1174static void diagnose_invalid_index_path(int stage,
1175 const char *prefix,
1176 const char *filename)
1177{
1178 struct stat st;
1179 struct cache_entry *ce;
1180 int pos;
1181 unsigned namelen = strlen(filename);
1182 unsigned fullnamelen;
1183 char *fullname;
1184
1185 if (!prefix)
1186 prefix = "";
1187
1188 /* Wrong stage number? */
1189 pos = cache_name_pos(filename, namelen);
1190 if (pos < 0)
1191 pos = -pos - 1;
77e8466f
MH
1192 if (pos < active_nr) {
1193 ce = active_cache[pos];
1194 if (ce_namelen(ce) == namelen &&
1195 !memcmp(ce->name, filename, namelen))
1196 die("Path '%s' is in the index, but not at stage %d.\n"
1197 "Did you mean ':%d:%s'?",
1198 filename, stage,
1199 ce_stage(ce), filename);
1200 }
009fee47
MM
1201
1202 /* Confusion between relative and absolute filenames? */
1203 fullnamelen = namelen + strlen(prefix);
1204 fullname = xmalloc(fullnamelen + 1);
1205 strcpy(fullname, prefix);
1206 strcat(fullname, filename);
1207 pos = cache_name_pos(fullname, fullnamelen);
1208 if (pos < 0)
1209 pos = -pos - 1;
77e8466f
MH
1210 if (pos < active_nr) {
1211 ce = active_cache[pos];
1212 if (ce_namelen(ce) == fullnamelen &&
1213 !memcmp(ce->name, fullname, fullnamelen))
1214 die("Path '%s' is in the index, but not '%s'.\n"
e41d718c 1215 "Did you mean ':%d:%s' aka ':%d:./%s'?",
77e8466f 1216 fullname, filename,
e41d718c
MG
1217 ce_stage(ce), fullname,
1218 ce_stage(ce), filename);
77e8466f 1219 }
009fee47
MM
1220
1221 if (!lstat(filename, &st))
1222 die("Path '%s' exists on disk, but not in the index.", filename);
1223 if (errno == ENOENT || errno == ENOTDIR)
1224 die("Path '%s' does not exist (neither on disk nor in the index).",
1225 filename);
1226
1227 free(fullname);
1228}
1229
1230
979f7929
NTND
1231static char *resolve_relative_path(const char *rel)
1232{
1233 if (prefixcmp(rel, "./") && prefixcmp(rel, "../"))
1234 return NULL;
1235
1236 if (!startup_info)
1237 die("BUG: startup_info struct is not initialized.");
1238
1239 if (!is_inside_work_tree())
1240 die("relative path syntax can't be used outside working tree.");
1241
1242 /* die() inside prefix_path() if resolved path is outside worktree */
1243 return prefix_path(startup_info->prefix,
1244 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1245 rel);
1246}
1247
33bd598c
JH
1248static int get_sha1_with_context_1(const char *name,
1249 unsigned flags,
1250 const char *prefix,
1251 unsigned char *sha1,
1252 struct object_context *oc)
a0cd87a5
MK
1253{
1254 int ret, bracket_depth;
73b0e5af
JH
1255 int namelen = strlen(name);
1256 const char *cp;
33bd598c 1257 int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
5119602a 1258
573285e5
CP
1259 memset(oc, 0, sizeof(*oc));
1260 oc->mode = S_IFINVALID;
33bd598c 1261 ret = get_sha1_1(name, namelen, sha1, flags);
73b0e5af
JH
1262 if (!ret)
1263 return ret;
33bd598c
JH
1264 /*
1265 * sha1:path --> object name of path in ent sha1
979f7929
NTND
1266 * :path -> object name of absolute path in index
1267 * :./path -> object name of path relative to cwd in index
73b0e5af 1268 * :[0-3]:path -> object name of path in index at stage
95ad6d2d 1269 * :/foo -> recent commit matching foo
73b0e5af
JH
1270 */
1271 if (name[0] == ':') {
1272 int stage = 0;
1273 struct cache_entry *ce;
979f7929 1274 char *new_path = NULL;
73b0e5af 1275 int pos;
2e83b66c 1276 if (!only_to_die && namelen > 2 && name[1] == '/') {
84baa31b
NTND
1277 struct commit_list *list = NULL;
1278 for_each_ref(handle_one_ref, &list);
1279 return get_sha1_oneline(name + 2, sha1, list);
1280 }
73b0e5af
JH
1281 if (namelen < 3 ||
1282 name[2] != ':' ||
1283 name[1] < '0' || '3' < name[1])
1284 cp = name + 1;
1285 else {
1286 stage = name[1] - '0';
1287 cp = name + 3;
5119602a 1288 }
3d6e0f74
JH
1289 new_path = resolve_relative_path(cp);
1290 if (!new_path) {
1291 namelen = namelen - (cp - name);
1292 } else {
1293 cp = new_path;
1294 namelen = strlen(cp);
1295 }
573285e5
CP
1296
1297 strncpy(oc->path, cp,
1298 sizeof(oc->path));
1299 oc->path[sizeof(oc->path)-1] = '\0';
1300
73b0e5af
JH
1301 if (!active_cache)
1302 read_cache();
73b0e5af
JH
1303 pos = cache_name_pos(cp, namelen);
1304 if (pos < 0)
1305 pos = -pos - 1;
1306 while (pos < active_nr) {
1307 ce = active_cache[pos];
1308 if (ce_namelen(ce) != namelen ||
1309 memcmp(ce->name, cp, namelen))
1310 break;
1311 if (ce_stage(ce) == stage) {
e702496e 1312 hashcpy(sha1, ce->sha1);
90064710 1313 oc->mode = ce->ce_mode;
979f7929 1314 free(new_path);
73b0e5af
JH
1315 return 0;
1316 }
e7cef45f 1317 pos++;
73b0e5af 1318 }
2e83b66c 1319 if (only_to_die && name[1] && name[1] != '/')
009fee47 1320 diagnose_invalid_index_path(stage, prefix, cp);
979f7929 1321 free(new_path);
73b0e5af
JH
1322 return -1;
1323 }
cce91a2c
SP
1324 for (cp = name, bracket_depth = 0; *cp; cp++) {
1325 if (*cp == '{')
1326 bracket_depth++;
1327 else if (bracket_depth && *cp == '}')
1328 bracket_depth--;
1329 else if (!bracket_depth && *cp == ':')
1330 break;
1331 }
1332 if (*cp == ':') {
73b0e5af 1333 unsigned char tree_sha1[20];
b2981d06
RS
1334 int len = cp - name;
1335 if (!get_sha1_1(name, len, tree_sha1, GET_SHA1_TREEISH)) {
009fee47 1336 const char *filename = cp+1;
979f7929
NTND
1337 char *new_filename = NULL;
1338
1339 new_filename = resolve_relative_path(filename);
1340 if (new_filename)
1341 filename = new_filename;
573285e5 1342 ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
d7236c43 1343 if (ret && only_to_die) {
009fee47 1344 diagnose_invalid_sha1_path(prefix, filename,
b2981d06
RS
1345 tree_sha1,
1346 name, len);
009fee47 1347 }
573285e5
CP
1348 hashcpy(oc->tree, tree_sha1);
1349 strncpy(oc->path, filename,
1350 sizeof(oc->path));
1351 oc->path[sizeof(oc->path)-1] = '\0';
1352
979f7929 1353 free(new_filename);
009fee47
MM
1354 return ret;
1355 } else {
2e83b66c 1356 if (only_to_die)
b2981d06 1357 die("Invalid object name '%.*s'.", len, name);
009fee47 1358 }
5119602a
LT
1359 }
1360 return ret;
9938af6a 1361}
f01cc14c 1362
8c135ea2
JH
1363/*
1364 * Call this function when you know "name" given by the end user must
1365 * name an object but it doesn't; the function _may_ die with a better
1366 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1367 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1368 * you have a chance to diagnose the error further.
1369 */
1370void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
f01cc14c
JH
1371{
1372 struct object_context oc;
8c135ea2 1373 unsigned char sha1[20];
33bd598c 1374 get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
8c135ea2
JH
1375}
1376
33bd598c 1377int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
f01cc14c 1378{
33bd598c 1379 return get_sha1_with_context_1(str, flags, NULL, sha1, orc);
f01cc14c 1380}