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