11 static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
13 typedef int (*disambiguate_hint_fn)(const unsigned char *, void *);
15 struct disambiguate_state {
16 disambiguate_hint_fn fn;
18 unsigned char candidate[20];
19 unsigned candidate_exists:1;
20 unsigned candidate_checked:1;
21 unsigned candidate_ok:1;
22 unsigned disambiguate_fn_used:1;
24 unsigned always_call_fn:1;
27 static void update_candidates(struct disambiguate_state *ds, const unsigned char *current)
29 if (ds->always_call_fn) {
30 ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;
33 if (!ds->candidate_exists) {
34 /* this is the first candidate */
35 hashcpy(ds->candidate, current);
36 ds->candidate_exists = 1;
38 } else if (!hashcmp(ds->candidate, current)) {
39 /* the same as what we already have seen */
44 /* cannot disambiguate between ds->candidate and current */
49 if (!ds->candidate_checked) {
50 ds->candidate_ok = ds->fn(ds->candidate, ds->cb_data);
51 ds->disambiguate_fn_used = 1;
52 ds->candidate_checked = 1;
55 if (!ds->candidate_ok) {
56 /* discard the candidate; we know it does not satisfy fn */
57 hashcpy(ds->candidate, current);
58 ds->candidate_checked = 0;
62 /* if we reach this point, we know ds->candidate satisfies fn */
63 if (ds->fn(current, ds->cb_data)) {
65 * if both current and candidate satisfy fn, we cannot
72 /* otherwise, current can be discarded and candidate is still good */
75 static void find_short_object_filename(int len, const char *hex_pfx, struct disambiguate_state *ds)
77 struct alternate_object_database *alt;
79 static struct alternate_object_database *fakeent;
83 * Create a "fake" alternate object database that
84 * points to our own object database, to make it
85 * easier to get a temporary working space in
86 * alt->name/alt->base while iterating over the
87 * object databases including our own.
89 const char *objdir = get_object_directory();
90 size_t objdir_len = strlen(objdir);
91 fakeent = xmalloc(st_add3(sizeof(*fakeent), objdir_len, 43));
92 memcpy(fakeent->base, objdir, objdir_len);
93 fakeent->name = fakeent->base + objdir_len + 1;
94 fakeent->name[-1] = '/';
96 fakeent->next = alt_odb_list;
98 xsnprintf(hex, sizeof(hex), "%.2s", hex_pfx);
99 for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) {
103 * every alt_odb struct has 42 extra bytes after the base
104 * for exactly this purpose
106 xsnprintf(alt->name, 42, "%.2s/", hex_pfx);
107 dir = opendir(alt->base);
111 while (!ds->ambiguous && (de = readdir(dir)) != NULL) {
112 unsigned char sha1[20];
114 if (strlen(de->d_name) != 38)
116 if (memcmp(de->d_name, hex_pfx + 2, len - 2))
118 memcpy(hex + 2, de->d_name, 38);
119 if (!get_sha1_hex(hex, sha1))
120 update_candidates(ds, sha1);
126 static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
136 if ((*a ^ *b) & 0xf0)
141 static void unique_in_pack(int len,
142 const unsigned char *bin_pfx,
143 struct packed_git *p,
144 struct disambiguate_state *ds)
146 uint32_t num, last, i, first = 0;
147 const unsigned char *current = NULL;
150 num = p->num_objects;
152 while (first < last) {
153 uint32_t mid = (first + last) / 2;
154 const unsigned char *current;
157 current = nth_packed_object_sha1(p, mid);
158 cmp = hashcmp(bin_pfx, current);
171 * At this point, "first" is the location of the lowest object
172 * with an object name that could match "bin_pfx". See if we have
173 * 0, 1 or more objects that actually match(es).
175 for (i = first; i < num && !ds->ambiguous; i++) {
176 current = nth_packed_object_sha1(p, i);
177 if (!match_sha(len, bin_pfx, current))
179 update_candidates(ds, current);
183 static void find_short_packed_object(int len, const unsigned char *bin_pfx,
184 struct disambiguate_state *ds)
186 struct packed_git *p;
188 prepare_packed_git();
189 for (p = packed_git; p && !ds->ambiguous; p = p->next)
190 unique_in_pack(len, bin_pfx, p, ds);
193 #define SHORT_NAME_NOT_FOUND (-1)
194 #define SHORT_NAME_AMBIGUOUS (-2)
196 static int finish_object_disambiguation(struct disambiguate_state *ds,
200 return SHORT_NAME_AMBIGUOUS;
202 if (!ds->candidate_exists)
203 return SHORT_NAME_NOT_FOUND;
205 if (!ds->candidate_checked)
207 * If this is the only candidate, there is no point
208 * calling the disambiguation hint callback.
210 * On the other hand, if the current candidate
211 * replaced an earlier candidate that did _not_ pass
212 * the disambiguation hint callback, then we do have
213 * more than one objects that match the short name
214 * given, so we should make sure this one matches;
215 * otherwise, if we discovered this one and the one
216 * that we previously discarded in the reverse order,
217 * we would end up showing different results in the
220 ds->candidate_ok = (!ds->disambiguate_fn_used ||
221 ds->fn(ds->candidate, ds->cb_data));
223 if (!ds->candidate_ok)
224 return SHORT_NAME_AMBIGUOUS;
226 hashcpy(sha1, ds->candidate);
230 static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused)
232 int kind = sha1_object_info(sha1, NULL);
233 return kind == OBJ_COMMIT;
236 static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data_unused)
241 kind = sha1_object_info(sha1, NULL);
242 if (kind == OBJ_COMMIT)
247 /* We need to do this the hard way... */
248 obj = deref_tag(parse_object(sha1), NULL, 0);
249 if (obj && obj->type == OBJ_COMMIT)
254 static int disambiguate_tree_only(const unsigned char *sha1, void *cb_data_unused)
256 int kind = sha1_object_info(sha1, NULL);
257 return kind == OBJ_TREE;
260 static int disambiguate_treeish_only(const unsigned char *sha1, void *cb_data_unused)
265 kind = sha1_object_info(sha1, NULL);
266 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
271 /* We need to do this the hard way... */
272 obj = deref_tag(lookup_object(sha1), NULL, 0);
273 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
278 static int disambiguate_blob_only(const unsigned char *sha1, void *cb_data_unused)
280 int kind = sha1_object_info(sha1, NULL);
281 return kind == OBJ_BLOB;
284 static int prepare_prefixes(const char *name, int len,
285 unsigned char *bin_pfx,
291 memset(hex_pfx, 'x', 40);
292 for (i = 0; i < len ;i++) {
293 unsigned char c = name[i];
295 if (c >= '0' && c <= '9')
297 else if (c >= 'a' && c <= 'f')
299 else if (c >= 'A' && c <='F') {
308 bin_pfx[i >> 1] |= val;
313 static int get_short_sha1(const char *name, int len, unsigned char *sha1,
318 unsigned char bin_pfx[20];
319 struct disambiguate_state ds;
320 int quietly = !!(flags & GET_SHA1_QUIETLY);
322 if (len < MINIMUM_ABBREV || len > 40)
324 if (prepare_prefixes(name, len, bin_pfx, hex_pfx) < 0)
329 memset(&ds, 0, sizeof(ds));
330 if (flags & GET_SHA1_COMMIT)
331 ds.fn = disambiguate_commit_only;
332 else if (flags & GET_SHA1_COMMITTISH)
333 ds.fn = disambiguate_committish_only;
334 else if (flags & GET_SHA1_TREE)
335 ds.fn = disambiguate_tree_only;
336 else if (flags & GET_SHA1_TREEISH)
337 ds.fn = disambiguate_treeish_only;
338 else if (flags & GET_SHA1_BLOB)
339 ds.fn = disambiguate_blob_only;
341 find_short_object_filename(len, hex_pfx, &ds);
342 find_short_packed_object(len, bin_pfx, &ds);
343 status = finish_object_disambiguation(&ds, sha1);
345 if (!quietly && (status == SHORT_NAME_AMBIGUOUS))
346 return error("short SHA1 %.*s is ambiguous.", len, hex_pfx);
350 int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
353 unsigned char bin_pfx[20];
354 struct disambiguate_state ds;
355 int len = strlen(prefix);
357 if (len < MINIMUM_ABBREV || len > 40)
359 if (prepare_prefixes(prefix, len, bin_pfx, hex_pfx) < 0)
364 memset(&ds, 0, sizeof(ds));
365 ds.always_call_fn = 1;
366 ds.cb_data = cb_data;
369 find_short_object_filename(len, hex_pfx, &ds);
370 find_short_packed_object(len, bin_pfx, &ds);
374 int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
378 sha1_to_hex_r(hex, sha1);
379 if (len == 40 || !len)
381 exists = has_sha1_file(sha1);
383 unsigned char sha1_ret[20];
384 status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
387 : status == SHORT_NAME_NOT_FOUND) {
396 const char *find_unique_abbrev(const unsigned char *sha1, int len)
398 static char hex[GIT_SHA1_HEXSZ + 1];
399 find_unique_abbrev_r(hex, sha1, len);
403 static int ambiguous_path(const char *path, int len)
408 for (cnt = 0; cnt < len; cnt++) {
428 static inline int at_mark(const char *string, int len,
429 const char **suffix, int nr)
433 for (i = 0; i < nr; i++) {
434 int suffix_len = strlen(suffix[i]);
435 if (suffix_len <= len
436 && !memcmp(string, suffix[i], suffix_len))
442 static inline int upstream_mark(const char *string, int len)
444 const char *suffix[] = { "@{upstream}", "@{u}" };
445 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
448 static inline int push_mark(const char *string, int len)
450 const char *suffix[] = { "@{push}" };
451 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
454 static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
455 static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
457 static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
460 static const char *warn_msg = "refname '%.*s' is ambiguous.";
461 static const char *object_name_msg = N_(
462 "Git normally never creates a ref that ends with 40 hex characters\n"
463 "because it will be ignored when you just specify 40-hex. These refs\n"
464 "may be created by mistake. For example,\n"
466 " git checkout -b $br $(git rev-parse ...)\n"
468 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
469 "examine these refs and maybe delete them. Turn this message off by\n"
470 "running \"git config advice.objectNameWarning false\"");
471 unsigned char tmp_sha1[20];
472 char *real_ref = NULL;
474 int at, reflog_len, nth_prior = 0;
476 if (len == 40 && !get_sha1_hex(str, sha1)) {
477 if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
478 refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
479 if (refs_found > 0) {
480 warning(warn_msg, len, str);
481 if (advice_object_name_warning)
482 fprintf(stderr, "%s\n", _(object_name_msg));
489 /* basic@{time or number or -number} format to query ref-log */
491 if (len && str[len-1] == '}') {
492 for (at = len-4; at >= 0; at--) {
493 if (str[at] == '@' && str[at+1] == '{') {
494 if (str[at+2] == '-') {
496 /* @{-N} not at start */
501 if (!upstream_mark(str + at, len - at) &&
502 !push_mark(str + at, len - at)) {
503 reflog_len = (len-1) - (at+2);
511 /* Accept only unambiguous ref paths. */
512 if (len && ambiguous_path(str, len))
516 struct strbuf buf = STRBUF_INIT;
519 if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
520 detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
521 strbuf_release(&buf);
527 if (!len && reflog_len)
528 /* allow "@{...}" to mean the current branch reflog */
529 refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
531 refs_found = dwim_log(str, len, sha1, &real_ref);
533 refs_found = dwim_ref(str, len, sha1, &real_ref);
538 if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) &&
540 !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
541 warning(warn_msg, len, str);
545 unsigned long at_time;
546 unsigned long co_time;
549 /* Is it asking for N-th entry, or approxidate? */
550 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
551 char ch = str[at+2+i];
552 if ('0' <= ch && ch <= '9')
553 nth = nth * 10 + ch - '0';
557 if (100000000 <= nth) {
564 char *tmp = xstrndup(str + at + 2, reflog_len);
565 at_time = approxidate_careful(tmp, &errors);
572 if (read_ref_at(real_ref, flags, at_time, nth, sha1, NULL,
573 &co_time, &co_tz, &co_cnt)) {
575 if (starts_with(real_ref, "refs/heads/")) {
577 len = strlen(real_ref + 11);
585 if (!(flags & GET_SHA1_QUIETLY)) {
586 warning("Log for '%.*s' only goes "
587 "back to %s.", len, str,
588 show_date(co_time, co_tz, DATE_MODE(RFC2822)));
591 if (flags & GET_SHA1_QUIETLY) {
594 die("Log for '%.*s' only has %d entries.",
604 static int get_parent(const char *name, int len,
605 unsigned char *result, int idx)
607 unsigned char sha1[20];
608 int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
609 struct commit *commit;
610 struct commit_list *p;
614 commit = lookup_commit_reference(sha1);
615 if (parse_commit(commit))
618 hashcpy(result, commit->object.oid.hash);
624 hashcpy(result, p->item->object.oid.hash);
632 static int get_nth_ancestor(const char *name, int len,
633 unsigned char *result, int generation)
635 unsigned char sha1[20];
636 struct commit *commit;
639 ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
642 commit = lookup_commit_reference(sha1);
646 while (generation--) {
647 if (parse_commit(commit) || !commit->parents)
649 commit = commit->parents->item;
651 hashcpy(result, commit->object.oid.hash);
655 struct object *peel_to_type(const char *name, int namelen,
656 struct object *o, enum object_type expected_type)
658 if (name && !namelen)
659 namelen = strlen(name);
661 if (!o || (!o->parsed && !parse_object(o->oid.hash)))
663 if (expected_type == OBJ_ANY || o->type == expected_type)
665 if (o->type == OBJ_TAG)
666 o = ((struct tag*) o)->tagged;
667 else if (o->type == OBJ_COMMIT)
668 o = &(((struct commit *) o)->tree->object);
671 error("%.*s: expected %s type, but the object "
672 "dereferences to %s type",
673 namelen, name, typename(expected_type),
680 static int peel_onion(const char *name, int len, unsigned char *sha1)
682 unsigned char outer[20];
684 unsigned int expected_type = 0;
685 unsigned lookup_flags = 0;
689 * "ref^{type}" dereferences ref repeatedly until you cannot
690 * dereference anymore, or you get an object of given type,
691 * whichever comes first. "ref^{}" means just dereference
692 * tags until you get a non-tag. "ref^0" is a shorthand for
693 * "ref^{commit}". "commit^{tree}" could be used to find the
694 * top-level tree of the given commit.
696 if (len < 4 || name[len-1] != '}')
699 for (sp = name + len - 1; name <= sp; sp--) {
701 if (ch == '{' && name < sp && sp[-1] == '^')
707 sp++; /* beginning of type name, or closing brace for empty */
708 if (starts_with(sp, "commit}"))
709 expected_type = OBJ_COMMIT;
710 else if (starts_with(sp, "tag}"))
711 expected_type = OBJ_TAG;
712 else if (starts_with(sp, "tree}"))
713 expected_type = OBJ_TREE;
714 else if (starts_with(sp, "blob}"))
715 expected_type = OBJ_BLOB;
716 else if (starts_with(sp, "object}"))
717 expected_type = OBJ_ANY;
718 else if (sp[0] == '}')
719 expected_type = OBJ_NONE;
720 else if (sp[0] == '/')
721 expected_type = OBJ_COMMIT;
725 if (expected_type == OBJ_COMMIT)
726 lookup_flags = GET_SHA1_COMMITTISH;
727 else if (expected_type == OBJ_TREE)
728 lookup_flags = GET_SHA1_TREEISH;
730 if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
733 o = parse_object(outer);
736 if (!expected_type) {
737 o = deref_tag(o, name, sp - name - 2);
738 if (!o || (!o->parsed && !parse_object(o->oid.hash)))
740 hashcpy(sha1, o->oid.hash);
745 * At this point, the syntax look correct, so
746 * if we do not get the needed object, we should
749 o = peel_to_type(name, len, o, expected_type);
753 hashcpy(sha1, o->oid.hash);
755 /* "$commit^{/foo}" */
758 struct commit_list *list = NULL;
761 * $commit^{/}. Some regex implementation may reject.
762 * We don't need regex anyway. '' pattern always matches.
767 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
768 commit_list_insert((struct commit *)o, &list);
769 ret = get_sha1_oneline(prefix, sha1, list);
776 static int get_describe_name(const char *name, int len, unsigned char *sha1)
779 unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
781 for (cp = name + len - 1; name + 2 <= cp; cp--) {
784 /* We must be looking at g in "SOMETHING-g"
785 * for it to be describe output.
787 if (ch == 'g' && cp[-1] == '-') {
790 return get_short_sha1(cp, len, sha1, flags);
797 static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
803 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
806 for (cp = name + len - 1; name <= cp; cp--) {
808 if ('0' <= ch && ch <= '9')
810 if (ch == '~' || ch == '^')
817 int len1 = cp - name;
819 while (cp < name + len)
820 num = num * 10 + *cp++ - '0';
821 if (!num && len1 == len - 1)
823 if (has_suffix == '^')
824 return get_parent(name, len1, sha1, num);
825 /* else if (has_suffix == '~') -- goes without saying */
826 return get_nth_ancestor(name, len1, sha1, num);
829 ret = peel_onion(name, len, sha1);
833 ret = get_sha1_basic(name, len, sha1, lookup_flags);
837 /* It could be describe output that is "SOMETHING-gXXXX" */
838 ret = get_describe_name(name, len, sha1);
842 return get_short_sha1(name, len, sha1, lookup_flags);
846 * This interprets names like ':/Initial revision of "git"' by searching
847 * through history and returning the first commit whose message starts
848 * the given regular expression.
850 * For future extension, ':/!' is reserved. If you want to match a message
851 * beginning with a '!', you have to repeat the exclamation mark.
854 /* Remember to update object flag allocation in object.h */
855 #define ONELINE_SEEN (1u<<20)
857 static int handle_one_ref(const char *path, const struct object_id *oid,
858 int flag, void *cb_data)
860 struct commit_list **list = cb_data;
861 struct object *object = parse_object(oid->hash);
864 if (object->type == OBJ_TAG) {
865 object = deref_tag(object, path, strlen(path));
869 if (object->type != OBJ_COMMIT)
871 commit_list_insert((struct commit *)object, list);
875 static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
876 struct commit_list *list)
878 struct commit_list *backup = NULL, *l;
882 if (prefix[0] == '!') {
883 if (prefix[1] != '!')
888 if (regcomp(®ex, prefix, REG_EXTENDED))
891 for (l = list; l; l = l->next) {
892 l->item->object.flags |= ONELINE_SEEN;
893 commit_list_insert(l->item, &backup);
897 struct commit *commit;
900 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
901 if (!parse_object(commit->object.oid.hash))
903 buf = get_commit_buffer(commit, NULL);
904 p = strstr(buf, "\n\n");
905 matches = p && !regexec(®ex, p + 2, 0, NULL, 0);
906 unuse_commit_buffer(commit, buf);
909 hashcpy(sha1, commit->object.oid.hash);
915 free_commit_list(list);
916 for (l = backup; l; l = l->next)
917 clear_commit_marks(l->item, ONELINE_SEEN);
918 free_commit_list(backup);
919 return found ? 0 : -1;
922 struct grab_nth_branch_switch_cbdata {
927 static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
928 const char *email, unsigned long timestamp, int tz,
929 const char *message, void *cb_data)
931 struct grab_nth_branch_switch_cbdata *cb = cb_data;
932 const char *match = NULL, *target = NULL;
935 if (skip_prefix(message, "checkout: moving from ", &match))
936 target = strstr(match, " to ");
938 if (!match || !target)
940 if (--(cb->remaining) == 0) {
941 len = target - match;
942 strbuf_reset(&cb->buf);
943 strbuf_add(&cb->buf, match, len);
944 return 1; /* we are done */
950 * Parse @{-N} syntax, return the number of characters parsed
951 * if successful; otherwise signal an error with negative value.
953 static int interpret_nth_prior_checkout(const char *name, int namelen,
958 struct grab_nth_branch_switch_cbdata cb;
964 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
966 brace = memchr(name, '}', namelen);
969 nth = strtol(name + 3, &num_end, 10);
970 if (num_end != brace)
975 strbuf_init(&cb.buf, 20);
978 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
980 strbuf_addbuf(buf, &cb.buf);
981 retval = brace - name + 1;
984 strbuf_release(&cb.buf);
988 int get_sha1_mb(const char *name, unsigned char *sha1)
990 struct commit *one, *two;
991 struct commit_list *mbs;
992 unsigned char sha1_tmp[20];
996 dots = strstr(name, "...");
998 return get_sha1(name, sha1);
1000 st = get_sha1("HEAD", sha1_tmp);
1003 strbuf_init(&sb, dots - name);
1004 strbuf_add(&sb, name, dots - name);
1005 st = get_sha1_committish(sb.buf, sha1_tmp);
1006 strbuf_release(&sb);
1010 one = lookup_commit_reference_gently(sha1_tmp, 0);
1014 if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", sha1_tmp))
1016 two = lookup_commit_reference_gently(sha1_tmp, 0);
1019 mbs = get_merge_bases(one, two);
1020 if (!mbs || mbs->next)
1024 hashcpy(sha1, mbs->item->object.oid.hash);
1026 free_commit_list(mbs);
1030 /* parse @something syntax, when 'something' is not {.*} */
1031 static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1035 if (len || name[1] == '{')
1038 /* make sure it's a single @, or @@{.*}, not @foo */
1039 next = memchr(name + len + 1, '@', namelen - len - 1);
1040 if (next && next[1] != '{')
1043 next = name + namelen;
1044 if (next != name + 1)
1048 strbuf_add(buf, "HEAD", 4);
1052 static int reinterpret(const char *name, int namelen, int len, struct strbuf *buf)
1054 /* we have extra data, which might need further processing */
1055 struct strbuf tmp = STRBUF_INIT;
1056 int used = buf->len;
1059 strbuf_add(buf, name + len, namelen - len);
1060 ret = interpret_branch_name(buf->buf, buf->len, &tmp);
1061 /* that data was not interpreted, remove our cruft */
1063 strbuf_setlen(buf, used);
1067 strbuf_addbuf(buf, &tmp);
1068 strbuf_release(&tmp);
1069 /* tweak for size of {-N} versus expanded ref name */
1070 return ret - used + len;
1073 static void set_shortened_ref(struct strbuf *buf, const char *ref)
1075 char *s = shorten_unambiguous_ref(ref, 0);
1077 strbuf_addstr(buf, s);
1081 static int interpret_branch_mark(const char *name, int namelen,
1082 int at, struct strbuf *buf,
1083 int (*get_mark)(const char *, int),
1084 const char *(*get_data)(struct branch *,
1088 struct branch *branch;
1089 struct strbuf err = STRBUF_INIT;
1092 len = get_mark(name + at, namelen - at);
1096 if (memchr(name, ':', at))
1100 char *name_str = xmemdupz(name, at);
1101 branch = branch_get(name_str);
1104 branch = branch_get(NULL);
1106 value = get_data(branch, &err);
1110 set_shortened_ref(buf, value);
1115 * This reads short-hand syntax that not only evaluates to a commit
1116 * object name, but also can act as if the end user spelled the name
1117 * of the branch from the command line.
1119 * - "@{-N}" finds the name of the Nth previous branch we were on, and
1120 * places the name of the branch in the given buf and returns the
1121 * number of characters parsed if successful.
1123 * - "<branch>@{upstream}" finds the name of the other ref that
1124 * <branch> is configured to merge with (missing <branch> defaults
1125 * to the current branch), and places the name of the branch in the
1126 * given buf and returns the number of characters parsed if
1129 * If the input is not of the accepted format, it returns a negative
1130 * number to signal an error.
1132 * If the input was ok but there are not N branch switches in the
1133 * reflog, it returns 0.
1135 int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
1139 int len = interpret_nth_prior_checkout(name, namelen, buf);
1142 namelen = strlen(name);
1145 return len; /* syntax Ok, not enough switches */
1146 } else if (len > 0) {
1148 return len; /* consumed all */
1150 return reinterpret(name, namelen, len, buf);
1154 (at = memchr(start, '@', namelen - (start - name)));
1157 len = interpret_empty_at(name, namelen, at - name, buf);
1159 return reinterpret(name, namelen, len, buf);
1161 len = interpret_branch_mark(name, namelen, at - name, buf,
1162 upstream_mark, branch_get_upstream);
1166 len = interpret_branch_mark(name, namelen, at - name, buf,
1167 push_mark, branch_get_push);
1175 int strbuf_branchname(struct strbuf *sb, const char *name)
1177 int len = strlen(name);
1178 int used = interpret_branch_name(name, len, sb);
1184 strbuf_add(sb, name + used, len - used);
1188 int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1190 strbuf_branchname(sb, name);
1193 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
1194 return check_refname_format(sb->buf, 0);
1198 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1199 * notably "xyz^" for "parent of xyz"
1201 int get_sha1(const char *name, unsigned char *sha1)
1203 struct object_context unused;
1204 return get_sha1_with_context(name, 0, sha1, &unused);
1208 * Many callers know that the user meant to name a commit-ish by
1209 * syntactical positions where the object name appears. Calling this
1210 * function allows the machinery to disambiguate shorter-than-unique
1211 * abbreviated object names between commit-ish and others.
1213 * Note that this does NOT error out when the named object is not a
1214 * commit-ish. It is merely to give a hint to the disambiguation
1217 int get_sha1_committish(const char *name, unsigned char *sha1)
1219 struct object_context unused;
1220 return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
1224 int get_sha1_treeish(const char *name, unsigned char *sha1)
1226 struct object_context unused;
1227 return get_sha1_with_context(name, GET_SHA1_TREEISH,
1231 int get_sha1_commit(const char *name, unsigned char *sha1)
1233 struct object_context unused;
1234 return get_sha1_with_context(name, GET_SHA1_COMMIT,
1238 int get_sha1_tree(const char *name, unsigned char *sha1)
1240 struct object_context unused;
1241 return get_sha1_with_context(name, GET_SHA1_TREE,
1245 int get_sha1_blob(const char *name, unsigned char *sha1)
1247 struct object_context unused;
1248 return get_sha1_with_context(name, GET_SHA1_BLOB,
1252 /* Must be called only when object_name:filename doesn't exist. */
1253 static void diagnose_invalid_sha1_path(const char *prefix,
1254 const char *filename,
1255 const unsigned char *tree_sha1,
1256 const char *object_name,
1257 int object_name_len)
1259 unsigned char sha1[20];
1265 if (file_exists(filename))
1266 die("Path '%s' exists on disk, but not in '%.*s'.",
1267 filename, object_name_len, object_name);
1268 if (errno == ENOENT || errno == ENOTDIR) {
1269 char *fullname = xstrfmt("%s%s", prefix, filename);
1271 if (!get_tree_entry(tree_sha1, fullname,
1273 die("Path '%s' exists, but not '%s'.\n"
1274 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
1277 object_name_len, object_name,
1279 object_name_len, object_name,
1282 die("Path '%s' does not exist in '%.*s'",
1283 filename, object_name_len, object_name);
1287 /* Must be called only when :stage:filename doesn't exist. */
1288 static void diagnose_invalid_index_path(int stage,
1290 const char *filename)
1292 const struct cache_entry *ce;
1294 unsigned namelen = strlen(filename);
1295 struct strbuf fullname = STRBUF_INIT;
1300 /* Wrong stage number? */
1301 pos = cache_name_pos(filename, namelen);
1304 if (pos < active_nr) {
1305 ce = active_cache[pos];
1306 if (ce_namelen(ce) == namelen &&
1307 !memcmp(ce->name, filename, namelen))
1308 die("Path '%s' is in the index, but not at stage %d.\n"
1309 "Did you mean ':%d:%s'?",
1311 ce_stage(ce), filename);
1314 /* Confusion between relative and absolute filenames? */
1315 strbuf_addstr(&fullname, prefix);
1316 strbuf_addstr(&fullname, filename);
1317 pos = cache_name_pos(fullname.buf, fullname.len);
1320 if (pos < active_nr) {
1321 ce = active_cache[pos];
1322 if (ce_namelen(ce) == fullname.len &&
1323 !memcmp(ce->name, fullname.buf, fullname.len))
1324 die("Path '%s' is in the index, but not '%s'.\n"
1325 "Did you mean ':%d:%s' aka ':%d:./%s'?",
1326 fullname.buf, filename,
1327 ce_stage(ce), fullname.buf,
1328 ce_stage(ce), filename);
1331 if (file_exists(filename))
1332 die("Path '%s' exists on disk, but not in the index.", filename);
1333 if (errno == ENOENT || errno == ENOTDIR)
1334 die("Path '%s' does not exist (neither on disk nor in the index).",
1337 strbuf_release(&fullname);
1341 static char *resolve_relative_path(const char *rel)
1343 if (!starts_with(rel, "./") && !starts_with(rel, "../"))
1347 die("BUG: startup_info struct is not initialized.");
1349 if (!is_inside_work_tree())
1350 die("relative path syntax can't be used outside working tree.");
1352 /* die() inside prefix_path() if resolved path is outside worktree */
1353 return prefix_path(startup_info->prefix,
1354 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1358 static int get_sha1_with_context_1(const char *name,
1361 unsigned char *sha1,
1362 struct object_context *oc)
1364 int ret, bracket_depth;
1365 int namelen = strlen(name);
1367 int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
1369 memset(oc, 0, sizeof(*oc));
1370 oc->mode = S_IFINVALID;
1371 ret = get_sha1_1(name, namelen, sha1, flags);
1375 * sha1:path --> object name of path in ent sha1
1376 * :path -> object name of absolute path in index
1377 * :./path -> object name of path relative to cwd in index
1378 * :[0-3]:path -> object name of path in index at stage
1379 * :/foo -> recent commit matching foo
1381 if (name[0] == ':') {
1383 const struct cache_entry *ce;
1384 char *new_path = NULL;
1386 if (!only_to_die && namelen > 2 && name[1] == '/') {
1387 struct commit_list *list = NULL;
1389 for_each_ref(handle_one_ref, &list);
1390 commit_list_sort_by_date(&list);
1391 return get_sha1_oneline(name + 2, sha1, list);
1395 name[1] < '0' || '3' < name[1])
1398 stage = name[1] - '0';
1401 new_path = resolve_relative_path(cp);
1403 namelen = namelen - (cp - name);
1406 namelen = strlen(cp);
1409 strlcpy(oc->path, cp, sizeof(oc->path));
1413 pos = cache_name_pos(cp, namelen);
1416 while (pos < active_nr) {
1417 ce = active_cache[pos];
1418 if (ce_namelen(ce) != namelen ||
1419 memcmp(ce->name, cp, namelen))
1421 if (ce_stage(ce) == stage) {
1422 hashcpy(sha1, ce->sha1);
1423 oc->mode = ce->ce_mode;
1429 if (only_to_die && name[1] && name[1] != '/')
1430 diagnose_invalid_index_path(stage, prefix, cp);
1434 for (cp = name, bracket_depth = 0; *cp; cp++) {
1437 else if (bracket_depth && *cp == '}')
1439 else if (!bracket_depth && *cp == ':')
1443 unsigned char tree_sha1[20];
1444 int len = cp - name;
1445 if (!get_sha1_1(name, len, tree_sha1, GET_SHA1_TREEISH)) {
1446 const char *filename = cp+1;
1447 char *new_filename = NULL;
1449 new_filename = resolve_relative_path(filename);
1451 filename = new_filename;
1452 if (flags & GET_SHA1_FOLLOW_SYMLINKS) {
1453 ret = get_tree_entry_follow_symlinks(tree_sha1,
1454 filename, sha1, &oc->symlink_path,
1457 ret = get_tree_entry(tree_sha1, filename,
1459 if (ret && only_to_die) {
1460 diagnose_invalid_sha1_path(prefix,
1466 hashcpy(oc->tree, tree_sha1);
1467 strlcpy(oc->path, filename, sizeof(oc->path));
1473 die("Invalid object name '%.*s'.", len, name);
1480 * Call this function when you know "name" given by the end user must
1481 * name an object but it doesn't; the function _may_ die with a better
1482 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1483 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1484 * you have a chance to diagnose the error further.
1486 void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
1488 struct object_context oc;
1489 unsigned char sha1[20];
1490 get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
1493 int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
1495 if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
1496 die("BUG: incompatible flags for get_sha1_with_context");
1497 return get_sha1_with_context_1(str, flags, NULL, sha1, orc);