sha1_name: refactor interpret_upstream_mark
[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) {
749f763d 55 /* discard the candidate; we know it does not satisfy fn */
a78fafe7
JH
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... */
94d75d1e 244 obj = deref_tag(parse_object(sha1), NULL, 0);
e2643617
JH
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
346int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
347{
348 char hex_pfx[40];
349 unsigned char bin_pfx[20];
350 struct disambiguate_state ds;
351 int len = strlen(prefix);
352
353 if (len < MINIMUM_ABBREV || len > 40)
354 return -1;
355 if (prepare_prefixes(prefix, len, bin_pfx, hex_pfx) < 0)
356 return -1;
357
358 prepare_alt_odb();
359
360 memset(&ds, 0, sizeof(ds));
361 ds.always_call_fn = 1;
362 ds.cb_data = cb_data;
363 ds.fn = fn;
364
365 find_short_object_filename(len, hex_pfx, &ds);
366 find_short_packed_object(len, bin_pfx, &ds);
367 return ds.ambiguous;
368}
369
013f276e
JH
370const char *find_unique_abbrev(const unsigned char *sha1, int len)
371{
b66fde9a 372 int status, exists;
013f276e 373 static char hex[41];
47dd0d59 374
013f276e 375 memcpy(hex, sha1_to_hex(sha1), 40);
02c5cba2 376 if (len == 40 || !len)
47dd0d59 377 return hex;
61e704e3 378 exists = has_sha1_file(sha1);
013f276e
JH
379 while (len < 40) {
380 unsigned char sha1_ret[20];
37c00e55 381 status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
b66fde9a
JH
382 if (exists
383 ? !status
384 : status == SHORT_NAME_NOT_FOUND) {
ea2c69ed 385 hex[len] = 0;
013f276e
JH
386 return hex;
387 }
013f276e
JH
388 len++;
389 }
b66fde9a 390 return hex;
9938af6a
JH
391}
392
6677c466 393static int ambiguous_path(const char *path, int len)
af13cdf2
LT
394{
395 int slash = 1;
6677c466 396 int cnt;
af13cdf2 397
6677c466 398 for (cnt = 0; cnt < len; cnt++) {
af13cdf2
LT
399 switch (*path++) {
400 case '\0':
401 break;
402 case '/':
403 if (slash)
404 break;
405 slash = 1;
406 continue;
407 case '.':
408 continue;
409 default:
410 slash = 0;
411 continue;
412 }
c054d64e 413 break;
af13cdf2 414 }
6677c466 415 return slash;
af13cdf2
LT
416}
417
a1ad0eb0
JK
418static inline int at_mark(const char *string, int len,
419 const char **suffix, int nr)
ae0ba8e2 420{
ae0ba8e2
JH
421 int i;
422
a1ad0eb0 423 for (i = 0; i < nr; i++) {
ae0ba8e2
JH
424 int suffix_len = strlen(suffix[i]);
425 if (suffix_len <= len
426 && !memcmp(string, suffix[i], suffix_len))
427 return suffix_len;
428 }
429 return 0;
430}
431
a1ad0eb0
JK
432static inline int upstream_mark(const char *string, int len)
433{
434 const char *suffix[] = { "@{upstream}", "@{u}" };
435 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
436}
437
e48ba200 438static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
8cd4249c 439static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
d18ba221 440
c41a87dd
DA
441static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
442 unsigned int flags)
e86eb666 443{
eedce784 444 static const char *warn_msg = "refname '%.*s' is ambiguous.";
798c35fc
NTND
445 static const char *object_name_msg = N_(
446 "Git normally never creates a ref that ends with 40 hex characters\n"
447 "because it will be ignored when you just specify 40-hex. These refs\n"
448 "may be created by mistake. For example,\n"
449 "\n"
450 " git checkout -b $br $(git rev-parse ...)\n"
451 "\n"
452 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
453 "examine these refs and maybe delete them. Turn this message off by\n"
8dc84fdc 454 "running \"git config advice.objectNameWarning false\"");
798c35fc 455 unsigned char tmp_sha1[20];
ed378ec7 456 char *real_ref = NULL;
ab2a1a32 457 int refs_found = 0;
128fd54d 458 int at, reflog_len, nth_prior = 0;
9938af6a 459
798c35fc 460 if (len == 40 && !get_sha1_hex(str, sha1)) {
832cf74c 461 if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
25fba78d 462 refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
832cf74c 463 if (refs_found > 0) {
25fba78d
JK
464 warning(warn_msg, len, str);
465 if (advice_object_name_warning)
466 fprintf(stderr, "%s\n", _(object_name_msg));
467 }
468 free(real_ref);
798c35fc 469 }
9938af6a 470 return 0;
798c35fc 471 }
9938af6a 472
d18ba221 473 /* basic@{time or number or -number} format to query ref-log */
694500ed 474 reflog_len = at = 0;
f265458f 475 if (len && str[len-1] == '}') {
e883a057 476 for (at = len-4; at >= 0; at--) {
ab2a1a32 477 if (str[at] == '@' && str[at+1] == '{') {
83d16bc7
RR
478 if (str[at+2] == '-') {
479 if (at != 0)
480 /* @{-N} not at start */
481 return -1;
128fd54d
FC
482 nth_prior = 1;
483 continue;
484 }
ae0ba8e2 485 if (!upstream_mark(str + at, len - at)) {
28fb8438
JS
486 reflog_len = (len-1) - (at+2);
487 len = at;
488 }
ab2a1a32
JH
489 break;
490 }
d556fae2
SP
491 }
492 }
493
af13cdf2 494 /* Accept only unambiguous ref paths. */
11cf8801 495 if (len && ambiguous_path(str, len))
af13cdf2
LT
496 return -1;
497
128fd54d 498 if (nth_prior) {
d18ba221 499 struct strbuf buf = STRBUF_INIT;
128fd54d
FC
500 int detached;
501
8cd4249c 502 if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
128fd54d
FC
503 detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
504 strbuf_release(&buf);
505 if (detached)
506 return 0;
d18ba221 507 }
128fd54d
FC
508 }
509
510 if (!len && reflog_len)
11cf8801
NP
511 /* allow "@{...}" to mean the current branch reflog */
512 refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
128fd54d 513 else if (reflog_len)
f2eba66d
NP
514 refs_found = dwim_log(str, len, sha1, &real_ref);
515 else
11cf8801 516 refs_found = dwim_ref(str, len, sha1, &real_ref);
d556fae2
SP
517
518 if (!refs_found)
519 return -1;
520
c41a87dd 521 if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) &&
798c35fc
NTND
522 (refs_found > 1 ||
523 !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
eedce784 524 warning(warn_msg, len, str);
d556fae2 525
ab2a1a32 526 if (reflog_len) {
ab2a1a32
JH
527 int nth, i;
528 unsigned long at_time;
16d7cc90
JH
529 unsigned long co_time;
530 int co_tz, co_cnt;
531
fe558516 532 /* Is it asking for N-th entry, or approxidate? */
ab2a1a32
JH
533 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
534 char ch = str[at+2+i];
535 if ('0' <= ch && ch <= '9')
536 nth = nth * 10 + ch - '0';
537 else
538 nth = -1;
539 }
ea360dd0
SP
540 if (100000000 <= nth) {
541 at_time = nth;
542 nth = -1;
543 } else if (0 <= nth)
ab2a1a32 544 at_time = 0;
861f00e3 545 else {
93cfa7c7 546 int errors = 0;
861f00e3 547 char *tmp = xstrndup(str + at + 2, reflog_len);
93cfa7c7 548 at_time = approxidate_careful(tmp, &errors);
861f00e3 549 free(tmp);
28b35632
JK
550 if (errors) {
551 free(real_ref);
a5e10acb 552 return -1;
28b35632 553 }
861f00e3 554 }
c41a87dd 555 if (read_ref_at(real_ref, flags, at_time, nth, sha1, NULL,
16d7cc90 556 &co_time, &co_tz, &co_cnt)) {
305ebea0 557 if (!len) {
59556548 558 if (starts_with(real_ref, "refs/heads/")) {
305ebea0
RR
559 str = real_ref + 11;
560 len = strlen(real_ref + 11);
561 } else {
562 /* detached HEAD */
563 str = "HEAD";
564 len = 4;
565 }
566 }
c41a87dd
DA
567 if (at_time) {
568 if (!(flags & GET_SHA1_QUIETLY)) {
569 warning("Log for '%.*s' only goes "
570 "back to %s.", len, str,
571 show_date(co_time, co_tz, DATE_RFC2822));
572 }
573 } else {
574 if (flags & GET_SHA1_QUIETLY) {
575 exit(128);
576 }
e6eedc31
JS
577 die("Log for '%.*s' only has %d entries.",
578 len, str, co_cnt);
579 }
16d7cc90 580 }
d556fae2
SP
581 }
582
ed378ec7 583 free(real_ref);
d556fae2 584 return 0;
9938af6a
JH
585}
586
9938af6a
JH
587static int get_parent(const char *name, int len,
588 unsigned char *result, int idx)
589{
590 unsigned char sha1[20];
e2643617 591 int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
9938af6a
JH
592 struct commit *commit;
593 struct commit_list *p;
594
595 if (ret)
596 return ret;
597 commit = lookup_commit_reference(sha1);
9938af6a
JH
598 if (parse_commit(commit))
599 return -1;
600 if (!idx) {
e702496e 601 hashcpy(result, commit->object.sha1);
9938af6a
JH
602 return 0;
603 }
604 p = commit->parents;
605 while (p) {
606 if (!--idx) {
e702496e 607 hashcpy(result, p->item->object.sha1);
9938af6a
JH
608 return 0;
609 }
610 p = p->next;
611 }
612 return -1;
613}
614
4f7599ac
JH
615static int get_nth_ancestor(const char *name, int len,
616 unsigned char *result, int generation)
617{
618 unsigned char sha1[20];
621ff675
LT
619 struct commit *commit;
620 int ret;
621
e2643617 622 ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
4f7599ac
JH
623 if (ret)
624 return ret;
621ff675
LT
625 commit = lookup_commit_reference(sha1);
626 if (!commit)
627 return -1;
4f7599ac
JH
628
629 while (generation--) {
621ff675 630 if (parse_commit(commit) || !commit->parents)
4f7599ac 631 return -1;
621ff675 632 commit = commit->parents->item;
4f7599ac 633 }
621ff675 634 hashcpy(result, commit->object.sha1);
4f7599ac
JH
635 return 0;
636}
637
81776315
JH
638struct object *peel_to_type(const char *name, int namelen,
639 struct object *o, enum object_type expected_type)
640{
641 if (name && !namelen)
642 namelen = strlen(name);
81776315
JH
643 while (1) {
644 if (!o || (!o->parsed && !parse_object(o->sha1)))
645 return NULL;
a6a3f2cc 646 if (expected_type == OBJ_ANY || o->type == expected_type)
81776315
JH
647 return o;
648 if (o->type == OBJ_TAG)
649 o = ((struct tag*) o)->tagged;
650 else if (o->type == OBJ_COMMIT)
651 o = &(((struct commit *) o)->tree->object);
652 else {
653 if (name)
654 error("%.*s: expected %s type, but the object "
655 "dereferences to %s type",
656 namelen, name, typename(expected_type),
657 typename(o->type));
658 return NULL;
659 }
660 }
661}
662
5385f52d
JH
663static int peel_onion(const char *name, int len, unsigned char *sha1)
664{
665 unsigned char outer[20];
666 const char *sp;
885a86ab 667 unsigned int expected_type = 0;
e2643617 668 unsigned lookup_flags = 0;
5385f52d
JH
669 struct object *o;
670
671 /*
672 * "ref^{type}" dereferences ref repeatedly until you cannot
673 * dereference anymore, or you get an object of given type,
674 * whichever comes first. "ref^{}" means just dereference
675 * tags until you get a non-tag. "ref^0" is a shorthand for
676 * "ref^{commit}". "commit^{tree}" could be used to find the
677 * top-level tree of the given commit.
678 */
679 if (len < 4 || name[len-1] != '}')
680 return -1;
681
682 for (sp = name + len - 1; name <= sp; sp--) {
683 int ch = *sp;
684 if (ch == '{' && name < sp && sp[-1] == '^')
685 break;
686 }
687 if (sp <= name)
688 return -1;
689
690 sp++; /* beginning of type name, or closing brace for empty */
59556548 691 if (starts_with(sp, "commit}"))
1974632c 692 expected_type = OBJ_COMMIT;
59556548 693 else if (starts_with(sp, "tag}"))
75aa26d3 694 expected_type = OBJ_TAG;
59556548 695 else if (starts_with(sp, "tree}"))
1974632c 696 expected_type = OBJ_TREE;
59556548 697 else if (starts_with(sp, "blob}"))
1974632c 698 expected_type = OBJ_BLOB;
59556548 699 else if (starts_with(sp, "object}"))
a6a3f2cc 700 expected_type = OBJ_ANY;
5385f52d 701 else if (sp[0] == '}')
1974632c 702 expected_type = OBJ_NONE;
32574b68
NTND
703 else if (sp[0] == '/')
704 expected_type = OBJ_COMMIT;
5385f52d
JH
705 else
706 return -1;
707
e2643617
JH
708 if (expected_type == OBJ_COMMIT)
709 lookup_flags = GET_SHA1_COMMITTISH;
ed1ca602
JH
710 else if (expected_type == OBJ_TREE)
711 lookup_flags = GET_SHA1_TREEISH;
e2643617
JH
712
713 if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
5385f52d
JH
714 return -1;
715
716 o = parse_object(outer);
717 if (!o)
718 return -1;
885a86ab 719 if (!expected_type) {
9534f40b 720 o = deref_tag(o, name, sp - name - 2);
6e1c6c10
JH
721 if (!o || (!o->parsed && !parse_object(o->sha1)))
722 return -1;
e702496e 723 hashcpy(sha1, o->sha1);
32574b68 724 return 0;
5385f52d 725 }
32574b68
NTND
726
727 /*
728 * At this point, the syntax look correct, so
729 * if we do not get the needed object, we should
730 * barf.
731 */
732 o = peel_to_type(name, len, o, expected_type);
733 if (!o)
81776315 734 return -1;
32574b68
NTND
735
736 hashcpy(sha1, o->sha1);
737 if (sp[0] == '/') {
738 /* "$commit^{/foo}" */
739 char *prefix;
740 int ret;
741 struct commit_list *list = NULL;
742
81776315 743 /*
4322842a
NTND
744 * $commit^{/}. Some regex implementation may reject.
745 * We don't need regex anyway. '' pattern always matches.
5385f52d 746 */
4322842a 747 if (sp[1] == '}')
81776315 748 return 0;
4322842a 749
32574b68
NTND
750 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
751 commit_list_insert((struct commit *)o, &list);
752 ret = get_sha1_oneline(prefix, sha1, list);
753 free(prefix);
754 return ret;
5385f52d
JH
755 }
756 return 0;
757}
758
7dd45e15
JH
759static int get_describe_name(const char *name, int len, unsigned char *sha1)
760{
761 const char *cp;
6269b6b6 762 unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
7dd45e15
JH
763
764 for (cp = name + len - 1; name + 2 <= cp; cp--) {
765 char ch = *cp;
6f75d45b 766 if (!isxdigit(ch)) {
7dd45e15
JH
767 /* We must be looking at g in "SOMETHING-g"
768 * for it to be describe output.
769 */
770 if (ch == 'g' && cp[-1] == '-') {
771 cp++;
772 len -= cp - name;
6269b6b6 773 return get_short_sha1(cp, len, sha1, flags);
7dd45e15
JH
774 }
775 }
776 }
777 return -1;
778}
779
e48ba200 780static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
9938af6a 781{
0601dbe1 782 int ret, has_suffix;
4f7599ac 783 const char *cp;
9938af6a 784
621ff675
LT
785 /*
786 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
4f7599ac 787 */
0601dbe1 788 has_suffix = 0;
4f7599ac
JH
789 for (cp = name + len - 1; name <= cp; cp--) {
790 int ch = *cp;
791 if ('0' <= ch && ch <= '9')
792 continue;
0601dbe1
JH
793 if (ch == '~' || ch == '^')
794 has_suffix = ch;
4f7599ac
JH
795 break;
796 }
0601dbe1
JH
797
798 if (has_suffix) {
799 int num = 0;
4f7599ac
JH
800 int len1 = cp - name;
801 cp++;
802 while (cp < name + len)
0601dbe1 803 num = num * 10 + *cp++ - '0';
621ff675
LT
804 if (!num && len1 == len - 1)
805 num = 1;
806 if (has_suffix == '^')
0601dbe1 807 return get_parent(name, len1, sha1, num);
0601dbe1
JH
808 /* else if (has_suffix == '~') -- goes without saying */
809 return get_nth_ancestor(name, len1, sha1, num);
4f7599ac
JH
810 }
811
5385f52d
JH
812 ret = peel_onion(name, len, sha1);
813 if (!ret)
814 return 0;
815
c41a87dd 816 ret = get_sha1_basic(name, len, sha1, lookup_flags);
9938af6a
JH
817 if (!ret)
818 return 0;
7dd45e15
JH
819
820 /* It could be describe output that is "SOMETHING-gXXXX" */
821 ret = get_describe_name(name, len, sha1);
822 if (!ret)
823 return 0;
824
e2643617 825 return get_short_sha1(name, len, sha1, lookup_flags);
9938af6a
JH
826}
827
f7bff003
JH
828/*
829 * This interprets names like ':/Initial revision of "git"' by searching
830 * through history and returning the first commit whose message starts
3d045897 831 * the given regular expression.
f7bff003
JH
832 *
833 * For future extension, ':/!' is reserved. If you want to match a message
834 * beginning with a '!', you have to repeat the exclamation mark.
835 */
208acbfb
NTND
836
837/* Remember to update object flag allocation in object.h */
f7bff003
JH
838#define ONELINE_SEEN (1u<<20)
839
28a4d940
JS
840static int handle_one_ref(const char *path,
841 const unsigned char *sha1, int flag, void *cb_data)
842{
843 struct commit_list **list = cb_data;
844 struct object *object = parse_object(sha1);
845 if (!object)
846 return 0;
affeef12 847 if (object->type == OBJ_TAG) {
28a4d940 848 object = deref_tag(object, path, strlen(path));
affeef12
MK
849 if (!object)
850 return 0;
851 }
28a4d940
JS
852 if (object->type != OBJ_COMMIT)
853 return 0;
e8d1dfe6 854 commit_list_insert((struct commit *)object, list);
28a4d940
JS
855 return 0;
856}
857
84baa31b
NTND
858static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
859 struct commit_list *list)
28a4d940 860{
84baa31b 861 struct commit_list *backup = NULL, *l;
28042dbc 862 int found = 0;
57895105 863 regex_t regex;
28a4d940
JS
864
865 if (prefix[0] == '!') {
866 if (prefix[1] != '!')
867 die ("Invalid search pattern: %s", prefix);
868 prefix++;
869 }
57895105
LT
870
871 if (regcomp(&regex, prefix, REG_EXTENDED))
872 die("Invalid search pattern: %s", prefix);
873
84baa31b
NTND
874 for (l = list; l; l = l->next) {
875 l->item->object.flags |= ONELINE_SEEN;
28a4d940 876 commit_list_insert(l->item, &backup);
84baa31b 877 }
ed8ad7e2 878 while (list) {
ba41c1c9 879 const char *p, *buf;
1358e7d6 880 struct commit *commit;
28042dbc 881 int matches;
ed8ad7e2
JM
882
883 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
283cdbcf
MK
884 if (!parse_object(commit->object.sha1))
885 continue;
8597ea3a 886 buf = get_commit_buffer(commit, NULL);
ba41c1c9 887 p = strstr(buf, "\n\n");
28042dbc 888 matches = p && !regexec(&regex, p + 2, 0, NULL, 0);
ba41c1c9 889 unuse_commit_buffer(commit, buf);
28042dbc
JH
890
891 if (matches) {
28a4d940 892 hashcpy(sha1, commit->object.sha1);
28042dbc 893 found = 1;
28a4d940
JS
894 break;
895 }
896 }
57895105 897 regfree(&regex);
28a4d940
JS
898 free_commit_list(list);
899 for (l = backup; l; l = l->next)
900 clear_commit_marks(l->item, ONELINE_SEEN);
28042dbc
JH
901 free_commit_list(backup);
902 return found ? 0 : -1;
28a4d940
JS
903}
904
ae5a6c36 905struct grab_nth_branch_switch_cbdata {
98f85ff4
JH
906 int remaining;
907 struct strbuf buf;
ae5a6c36
JH
908};
909
910static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
911 const char *email, unsigned long timestamp, int tz,
912 const char *message, void *cb_data)
913{
914 struct grab_nth_branch_switch_cbdata *cb = cb_data;
a884d0cb
TR
915 const char *match = NULL, *target = NULL;
916 size_t len;
917
95b567c7 918 if (skip_prefix(message, "checkout: moving from ", &match))
d7c03c1f 919 target = strstr(match, " to ");
ae5a6c36 920
c829774c 921 if (!match || !target)
ae5a6c36 922 return 0;
98f85ff4
JH
923 if (--(cb->remaining) == 0) {
924 len = target - match;
925 strbuf_reset(&cb->buf);
926 strbuf_add(&cb->buf, match, len);
927 return 1; /* we are done */
928 }
ae5a6c36
JH
929 return 0;
930}
931
932/*
ae0ba8e2
JH
933 * Parse @{-N} syntax, return the number of characters parsed
934 * if successful; otherwise signal an error with negative value.
ae5a6c36 935 */
8cd4249c
JK
936static int interpret_nth_prior_checkout(const char *name, int namelen,
937 struct strbuf *buf)
ae5a6c36 938{
c2883e62 939 long nth;
98f85ff4 940 int retval;
ae5a6c36 941 struct grab_nth_branch_switch_cbdata cb;
a884d0cb
TR
942 const char *brace;
943 char *num_end;
ae5a6c36 944
8cd4249c
JK
945 if (namelen < 4)
946 return -1;
ae5a6c36
JH
947 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
948 return -1;
8cd4249c 949 brace = memchr(name, '}', namelen);
a884d0cb
TR
950 if (!brace)
951 return -1;
98f85ff4 952 nth = strtol(name + 3, &num_end, 10);
a884d0cb 953 if (num_end != brace)
ae5a6c36 954 return -1;
c2883e62
JH
955 if (nth <= 0)
956 return -1;
98f85ff4
JH
957 cb.remaining = nth;
958 strbuf_init(&cb.buf, 20);
959
39765e59 960 retval = 0;
98f85ff4
JH
961 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
962 strbuf_reset(buf);
e992d1eb 963 strbuf_addbuf(buf, &cb.buf);
98f85ff4
JH
964 retval = brace - name + 1;
965 }
a884d0cb 966
98f85ff4 967 strbuf_release(&cb.buf);
39765e59 968 return retval;
ae5a6c36
JH
969}
970
619a644d
JH
971int get_sha1_mb(const char *name, unsigned char *sha1)
972{
973 struct commit *one, *two;
974 struct commit_list *mbs;
975 unsigned char sha1_tmp[20];
976 const char *dots;
977 int st;
978
979 dots = strstr(name, "...");
980 if (!dots)
981 return get_sha1(name, sha1);
982 if (dots == name)
983 st = get_sha1("HEAD", sha1_tmp);
984 else {
985 struct strbuf sb;
986 strbuf_init(&sb, dots - name);
987 strbuf_add(&sb, name, dots - name);
cd74e473 988 st = get_sha1_committish(sb.buf, sha1_tmp);
619a644d
JH
989 strbuf_release(&sb);
990 }
991 if (st)
992 return st;
993 one = lookup_commit_reference_gently(sha1_tmp, 0);
994 if (!one)
995 return -1;
996
cd74e473 997 if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", sha1_tmp))
619a644d
JH
998 return -1;
999 two = lookup_commit_reference_gently(sha1_tmp, 0);
1000 if (!two)
1001 return -1;
2ce406cc 1002 mbs = get_merge_bases(one, two);
619a644d
JH
1003 if (!mbs || mbs->next)
1004 st = -1;
1005 else {
1006 st = 0;
1007 hashcpy(sha1, mbs->item->object.sha1);
1008 }
1009 free_commit_list(mbs);
1010 return st;
1011}
1012
9ba89f48
FC
1013/* parse @something syntax, when 'something' is not {.*} */
1014static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1015{
1016 const char *next;
1017
1018 if (len || name[1] == '{')
1019 return -1;
1020
1021 /* make sure it's a single @, or @@{.*}, not @foo */
8cd4249c 1022 next = memchr(name + len + 1, '@', namelen - len - 1);
9ba89f48
FC
1023 if (next && next[1] != '{')
1024 return -1;
1025 if (!next)
1026 next = name + namelen;
1027 if (next != name + 1)
1028 return -1;
1029
1030 strbuf_reset(buf);
1031 strbuf_add(buf, "HEAD", 4);
1032 return 1;
1033}
1034
7a0a49a7
FC
1035static int reinterpret(const char *name, int namelen, int len, struct strbuf *buf)
1036{
1037 /* we have extra data, which might need further processing */
1038 struct strbuf tmp = STRBUF_INIT;
1039 int used = buf->len;
1040 int ret;
1041
1042 strbuf_add(buf, name + len, namelen - len);
cf99a761 1043 ret = interpret_branch_name(buf->buf, buf->len, &tmp);
7a0a49a7
FC
1044 /* that data was not interpreted, remove our cruft */
1045 if (ret < 0) {
1046 strbuf_setlen(buf, used);
1047 return len;
1048 }
1049 strbuf_reset(buf);
1050 strbuf_addbuf(buf, &tmp);
1051 strbuf_release(&tmp);
1052 /* tweak for size of {-N} versus expanded ref name */
1053 return ret - used + len;
1054}
1055
a39c14af
JK
1056static void set_shortened_ref(struct strbuf *buf, const char *ref)
1057{
1058 char *s = shorten_unambiguous_ref(ref, 0);
1059 strbuf_reset(buf);
1060 strbuf_addstr(buf, s);
1061 free(s);
1062}
1063
48c58471
JK
1064static int interpret_branch_mark(const char *name, int namelen,
1065 int at, struct strbuf *buf,
1066 int (*get_mark)(const char *, int),
1067 const char *(*get_data)(struct branch *,
1068 struct strbuf *))
a39c14af
JK
1069{
1070 int len;
48c58471
JK
1071 struct branch *branch;
1072 struct strbuf err = STRBUF_INIT;
1073 const char *value;
a39c14af 1074
48c58471 1075 len = get_mark(name + at, namelen - at);
a39c14af
JK
1076 if (!len)
1077 return -1;
1078
3f6eb30f
JK
1079 if (memchr(name, ':', at))
1080 return -1;
1081
48c58471
JK
1082 if (at) {
1083 char *name_str = xmemdupz(name, at);
1084 branch = branch_get(name_str);
1085 free(name_str);
1086 } else
1087 branch = branch_get(NULL);
1088
1089 value = get_data(branch, &err);
1090 if (!value)
1091 die("%s", err.buf);
1092
1093 set_shortened_ref(buf, value);
a39c14af
JK
1094 return len + at;
1095}
1096
ae0ba8e2
JH
1097/*
1098 * This reads short-hand syntax that not only evaluates to a commit
1099 * object name, but also can act as if the end user spelled the name
1100 * of the branch from the command line.
1101 *
1102 * - "@{-N}" finds the name of the Nth previous branch we were on, and
1103 * places the name of the branch in the given buf and returns the
1104 * number of characters parsed if successful.
1105 *
1106 * - "<branch>@{upstream}" finds the name of the other ref that
1107 * <branch> is configured to merge with (missing <branch> defaults
1108 * to the current branch), and places the name of the branch in the
1109 * given buf and returns the number of characters parsed if
1110 * successful.
1111 *
1112 * If the input is not of the accepted format, it returns a negative
1113 * number to signal an error.
1114 *
1115 * If the input was ok but there are not N branch switches in the
1116 * reflog, it returns 0.
1117 */
cf99a761 1118int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
ae0ba8e2 1119{
f278f40f 1120 char *at;
9892d5d4 1121 const char *start;
8cd4249c 1122 int len = interpret_nth_prior_checkout(name, namelen, buf);
ae0ba8e2 1123
cf99a761
FC
1124 if (!namelen)
1125 namelen = strlen(name);
1126
1f27e7d5 1127 if (!len) {
ae0ba8e2 1128 return len; /* syntax Ok, not enough switches */
1f27e7d5
FC
1129 } else if (len > 0) {
1130 if (len == namelen)
1131 return len; /* consumed all */
1132 else
1133 return reinterpret(name, namelen, len, buf);
d46a8301
JK
1134 }
1135
9892d5d4
JK
1136 for (start = name;
1137 (at = memchr(start, '@', namelen - (start - name)));
1138 start = at + 1) {
9ba89f48 1139
9892d5d4
JK
1140 len = interpret_empty_at(name, namelen, at - name, buf);
1141 if (len > 0)
1142 return reinterpret(name, namelen, len, buf);
9ba89f48 1143
48c58471
JK
1144 len = interpret_branch_mark(name, namelen, at - name, buf,
1145 upstream_mark, branch_get_upstream);
9892d5d4
JK
1146 if (len > 0)
1147 return len;
bb0dab5d 1148 }
9ba89f48 1149
a39c14af 1150 return -1;
ae0ba8e2
JH
1151}
1152
6bab74e7
JN
1153int strbuf_branchname(struct strbuf *sb, const char *name)
1154{
1155 int len = strlen(name);
cf99a761 1156 int used = interpret_branch_name(name, len, sb);
84cf2466
JH
1157
1158 if (used == len)
6bab74e7 1159 return 0;
84cf2466
JH
1160 if (used < 0)
1161 used = 0;
1162 strbuf_add(sb, name + used, len - used);
6bab74e7
JN
1163 return len;
1164}
1165
1166int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1167{
1168 strbuf_branchname(sb, name);
1169 if (name[0] == '-')
8d9c5010 1170 return -1;
6bab74e7 1171 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
8d9c5010 1172 return check_refname_format(sb->buf, 0);
6bab74e7
JN
1173}
1174
9938af6a
JH
1175/*
1176 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1177 * notably "xyz^" for "parent of xyz"
1178 */
1179int get_sha1(const char *name, unsigned char *sha1)
1180{
573285e5 1181 struct object_context unused;
33bd598c 1182 return get_sha1_with_context(name, 0, sha1, &unused);
a0cd87a5
MK
1183}
1184
cd74e473 1185/*
a8a5406a 1186 * Many callers know that the user meant to name a commit-ish by
cd74e473
JH
1187 * syntactical positions where the object name appears. Calling this
1188 * function allows the machinery to disambiguate shorter-than-unique
a8a5406a 1189 * abbreviated object names between commit-ish and others.
cd74e473
JH
1190 *
1191 * Note that this does NOT error out when the named object is not a
a8a5406a 1192 * commit-ish. It is merely to give a hint to the disambiguation
cd74e473
JH
1193 * machinery.
1194 */
1195int get_sha1_committish(const char *name, unsigned char *sha1)
1196{
1197 struct object_context unused;
1198 return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
1199 sha1, &unused);
1200}
1201
daba53ae
JH
1202int get_sha1_treeish(const char *name, unsigned char *sha1)
1203{
1204 struct object_context unused;
1205 return get_sha1_with_context(name, GET_SHA1_TREEISH,
1206 sha1, &unused);
1207}
1208
1209int get_sha1_commit(const char *name, unsigned char *sha1)
1210{
1211 struct object_context unused;
1212 return get_sha1_with_context(name, GET_SHA1_COMMIT,
1213 sha1, &unused);
1214}
1215
1216int get_sha1_tree(const char *name, unsigned char *sha1)
1217{
1218 struct object_context unused;
1219 return get_sha1_with_context(name, GET_SHA1_TREE,
1220 sha1, &unused);
1221}
1222
1223int get_sha1_blob(const char *name, unsigned char *sha1)
1224{
1225 struct object_context unused;
1226 return get_sha1_with_context(name, GET_SHA1_BLOB,
1227 sha1, &unused);
a0cd87a5
MK
1228}
1229
009fee47
MM
1230/* Must be called only when object_name:filename doesn't exist. */
1231static void diagnose_invalid_sha1_path(const char *prefix,
1232 const char *filename,
1233 const unsigned char *tree_sha1,
b2981d06
RS
1234 const char *object_name,
1235 int object_name_len)
009fee47
MM
1236{
1237 struct stat st;
1238 unsigned char sha1[20];
1239 unsigned mode;
1240
1241 if (!prefix)
1242 prefix = "";
1243
1244 if (!lstat(filename, &st))
b2981d06
RS
1245 die("Path '%s' exists on disk, but not in '%.*s'.",
1246 filename, object_name_len, object_name);
009fee47 1247 if (errno == ENOENT || errno == ENOTDIR) {
b2724c87 1248 char *fullname = xstrfmt("%s%s", prefix, filename);
009fee47
MM
1249
1250 if (!get_tree_entry(tree_sha1, fullname,
1251 sha1, &mode)) {
1252 die("Path '%s' exists, but not '%s'.\n"
b2981d06 1253 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
009fee47
MM
1254 fullname,
1255 filename,
b2981d06 1256 object_name_len, object_name,
e41d718c 1257 fullname,
b2981d06 1258 object_name_len, object_name,
e41d718c 1259 filename);
009fee47 1260 }
b2981d06
RS
1261 die("Path '%s' does not exist in '%.*s'",
1262 filename, object_name_len, object_name);
009fee47
MM
1263 }
1264}
1265
1266/* Must be called only when :stage:filename doesn't exist. */
1267static void diagnose_invalid_index_path(int stage,
1268 const char *prefix,
1269 const char *filename)
1270{
1271 struct stat st;
9c5e6c80 1272 const struct cache_entry *ce;
009fee47
MM
1273 int pos;
1274 unsigned namelen = strlen(filename);
1275 unsigned fullnamelen;
1276 char *fullname;
1277
1278 if (!prefix)
1279 prefix = "";
1280
1281 /* Wrong stage number? */
1282 pos = cache_name_pos(filename, namelen);
1283 if (pos < 0)
1284 pos = -pos - 1;
77e8466f
MH
1285 if (pos < active_nr) {
1286 ce = active_cache[pos];
1287 if (ce_namelen(ce) == namelen &&
1288 !memcmp(ce->name, filename, namelen))
1289 die("Path '%s' is in the index, but not at stage %d.\n"
1290 "Did you mean ':%d:%s'?",
1291 filename, stage,
1292 ce_stage(ce), filename);
1293 }
009fee47
MM
1294
1295 /* Confusion between relative and absolute filenames? */
1296 fullnamelen = namelen + strlen(prefix);
1297 fullname = xmalloc(fullnamelen + 1);
1298 strcpy(fullname, prefix);
1299 strcat(fullname, filename);
1300 pos = cache_name_pos(fullname, fullnamelen);
1301 if (pos < 0)
1302 pos = -pos - 1;
77e8466f
MH
1303 if (pos < active_nr) {
1304 ce = active_cache[pos];
1305 if (ce_namelen(ce) == fullnamelen &&
1306 !memcmp(ce->name, fullname, fullnamelen))
1307 die("Path '%s' is in the index, but not '%s'.\n"
e41d718c 1308 "Did you mean ':%d:%s' aka ':%d:./%s'?",
77e8466f 1309 fullname, filename,
e41d718c
MG
1310 ce_stage(ce), fullname,
1311 ce_stage(ce), filename);
77e8466f 1312 }
009fee47
MM
1313
1314 if (!lstat(filename, &st))
1315 die("Path '%s' exists on disk, but not in the index.", filename);
1316 if (errno == ENOENT || errno == ENOTDIR)
1317 die("Path '%s' does not exist (neither on disk nor in the index).",
1318 filename);
1319
1320 free(fullname);
1321}
1322
1323
979f7929
NTND
1324static char *resolve_relative_path(const char *rel)
1325{
59556548 1326 if (!starts_with(rel, "./") && !starts_with(rel, "../"))
979f7929
NTND
1327 return NULL;
1328
1329 if (!startup_info)
1330 die("BUG: startup_info struct is not initialized.");
1331
1332 if (!is_inside_work_tree())
1333 die("relative path syntax can't be used outside working tree.");
1334
1335 /* die() inside prefix_path() if resolved path is outside worktree */
1336 return prefix_path(startup_info->prefix,
1337 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1338 rel);
1339}
1340
33bd598c
JH
1341static int get_sha1_with_context_1(const char *name,
1342 unsigned flags,
1343 const char *prefix,
1344 unsigned char *sha1,
1345 struct object_context *oc)
a0cd87a5
MK
1346{
1347 int ret, bracket_depth;
73b0e5af
JH
1348 int namelen = strlen(name);
1349 const char *cp;
33bd598c 1350 int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
5119602a 1351
573285e5
CP
1352 memset(oc, 0, sizeof(*oc));
1353 oc->mode = S_IFINVALID;
33bd598c 1354 ret = get_sha1_1(name, namelen, sha1, flags);
73b0e5af
JH
1355 if (!ret)
1356 return ret;
33bd598c
JH
1357 /*
1358 * sha1:path --> object name of path in ent sha1
979f7929
NTND
1359 * :path -> object name of absolute path in index
1360 * :./path -> object name of path relative to cwd in index
73b0e5af 1361 * :[0-3]:path -> object name of path in index at stage
95ad6d2d 1362 * :/foo -> recent commit matching foo
73b0e5af
JH
1363 */
1364 if (name[0] == ':') {
1365 int stage = 0;
9c5e6c80 1366 const struct cache_entry *ce;
979f7929 1367 char *new_path = NULL;
73b0e5af 1368 int pos;
2e83b66c 1369 if (!only_to_die && namelen > 2 && name[1] == '/') {
84baa31b
NTND
1370 struct commit_list *list = NULL;
1371 for_each_ref(handle_one_ref, &list);
e8d1dfe6 1372 commit_list_sort_by_date(&list);
84baa31b
NTND
1373 return get_sha1_oneline(name + 2, sha1, list);
1374 }
73b0e5af
JH
1375 if (namelen < 3 ||
1376 name[2] != ':' ||
1377 name[1] < '0' || '3' < name[1])
1378 cp = name + 1;
1379 else {
1380 stage = name[1] - '0';
1381 cp = name + 3;
5119602a 1382 }
3d6e0f74
JH
1383 new_path = resolve_relative_path(cp);
1384 if (!new_path) {
1385 namelen = namelen - (cp - name);
1386 } else {
1387 cp = new_path;
1388 namelen = strlen(cp);
1389 }
573285e5 1390
2ce63e9f 1391 strlcpy(oc->path, cp, sizeof(oc->path));
573285e5 1392
73b0e5af
JH
1393 if (!active_cache)
1394 read_cache();
73b0e5af
JH
1395 pos = cache_name_pos(cp, namelen);
1396 if (pos < 0)
1397 pos = -pos - 1;
1398 while (pos < active_nr) {
1399 ce = active_cache[pos];
1400 if (ce_namelen(ce) != namelen ||
1401 memcmp(ce->name, cp, namelen))
1402 break;
1403 if (ce_stage(ce) == stage) {
e702496e 1404 hashcpy(sha1, ce->sha1);
90064710 1405 oc->mode = ce->ce_mode;
979f7929 1406 free(new_path);
73b0e5af
JH
1407 return 0;
1408 }
e7cef45f 1409 pos++;
73b0e5af 1410 }
2e83b66c 1411 if (only_to_die && name[1] && name[1] != '/')
009fee47 1412 diagnose_invalid_index_path(stage, prefix, cp);
979f7929 1413 free(new_path);
73b0e5af
JH
1414 return -1;
1415 }
cce91a2c
SP
1416 for (cp = name, bracket_depth = 0; *cp; cp++) {
1417 if (*cp == '{')
1418 bracket_depth++;
1419 else if (bracket_depth && *cp == '}')
1420 bracket_depth--;
1421 else if (!bracket_depth && *cp == ':')
1422 break;
1423 }
1424 if (*cp == ':') {
73b0e5af 1425 unsigned char tree_sha1[20];
b2981d06
RS
1426 int len = cp - name;
1427 if (!get_sha1_1(name, len, tree_sha1, GET_SHA1_TREEISH)) {
009fee47 1428 const char *filename = cp+1;
979f7929
NTND
1429 char *new_filename = NULL;
1430
1431 new_filename = resolve_relative_path(filename);
1432 if (new_filename)
1433 filename = new_filename;
573285e5 1434 ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
d7236c43 1435 if (ret && only_to_die) {
009fee47 1436 diagnose_invalid_sha1_path(prefix, filename,
b2981d06
RS
1437 tree_sha1,
1438 name, len);
009fee47 1439 }
573285e5 1440 hashcpy(oc->tree, tree_sha1);
2ce63e9f 1441 strlcpy(oc->path, filename, sizeof(oc->path));
573285e5 1442
979f7929 1443 free(new_filename);
009fee47
MM
1444 return ret;
1445 } else {
2e83b66c 1446 if (only_to_die)
b2981d06 1447 die("Invalid object name '%.*s'.", len, name);
009fee47 1448 }
5119602a
LT
1449 }
1450 return ret;
9938af6a 1451}
f01cc14c 1452
8c135ea2
JH
1453/*
1454 * Call this function when you know "name" given by the end user must
1455 * name an object but it doesn't; the function _may_ die with a better
1456 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1457 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1458 * you have a chance to diagnose the error further.
1459 */
1460void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
f01cc14c
JH
1461{
1462 struct object_context oc;
8c135ea2 1463 unsigned char sha1[20];
33bd598c 1464 get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
8c135ea2
JH
1465}
1466
33bd598c 1467int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
f01cc14c 1468{
33bd598c 1469 return get_sha1_with_context_1(str, flags, NULL, sha1, orc);
f01cc14c 1470}