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