11 #include "sha1-array.h"
13 static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
15 typedef int (*disambiguate_hint_fn)(const struct object_id *, void *);
17 struct disambiguate_state {
18 int len; /* length of prefix in hex chars */
19 char hex_pfx[GIT_MAX_HEXSZ + 1];
20 struct object_id bin_pfx;
22 disambiguate_hint_fn fn;
24 struct object_id candidate;
25 unsigned candidate_exists:1;
26 unsigned candidate_checked:1;
27 unsigned candidate_ok:1;
28 unsigned disambiguate_fn_used:1;
30 unsigned always_call_fn:1;
33 static void update_candidates(struct disambiguate_state *ds, const struct object_id *current)
35 if (ds->always_call_fn) {
36 ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;
39 if (!ds->candidate_exists) {
40 /* this is the first candidate */
41 oidcpy(&ds->candidate, current);
42 ds->candidate_exists = 1;
44 } else if (!oidcmp(&ds->candidate, current)) {
45 /* the same as what we already have seen */
50 /* cannot disambiguate between ds->candidate and current */
55 if (!ds->candidate_checked) {
56 ds->candidate_ok = ds->fn(&ds->candidate, ds->cb_data);
57 ds->disambiguate_fn_used = 1;
58 ds->candidate_checked = 1;
61 if (!ds->candidate_ok) {
62 /* discard the candidate; we know it does not satisfy fn */
63 oidcpy(&ds->candidate, current);
64 ds->candidate_checked = 0;
68 /* if we reach this point, we know ds->candidate satisfies fn */
69 if (ds->fn(current, ds->cb_data)) {
71 * if both current and candidate satisfy fn, we cannot
78 /* otherwise, current can be discarded and candidate is still good */
81 static int append_loose_object(const struct object_id *oid, const char *path,
84 oid_array_append(data, oid);
88 static int match_sha(unsigned, const unsigned char *, const unsigned char *);
90 static void find_short_object_filename(struct disambiguate_state *ds)
92 int subdir_nr = ds->bin_pfx.hash[0];
93 struct alternate_object_database *alt;
94 static struct alternate_object_database *fakeent;
98 * Create a "fake" alternate object database that
99 * points to our own object database, to make it
100 * easier to get a temporary working space in
101 * alt->name/alt->base while iterating over the
102 * object databases including our own.
104 fakeent = alloc_alt_odb(get_object_directory());
106 fakeent->next = alt_odb_list;
108 for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) {
111 if (!alt->loose_objects_subdir_seen[subdir_nr]) {
112 struct strbuf *buf = alt_scratch_buf(alt);
113 for_each_file_in_obj_subdir(subdir_nr, buf,
116 &alt->loose_objects_cache);
117 alt->loose_objects_subdir_seen[subdir_nr] = 1;
120 pos = oid_array_lookup(&alt->loose_objects_cache, &ds->bin_pfx);
123 while (!ds->ambiguous && pos < alt->loose_objects_cache.nr) {
124 const struct object_id *oid;
125 oid = alt->loose_objects_cache.oid + pos;
126 if (!match_sha(ds->len, ds->bin_pfx.hash, oid->hash))
128 update_candidates(ds, oid);
134 static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
144 if ((*a ^ *b) & 0xf0)
149 static void unique_in_pack(struct packed_git *p,
150 struct disambiguate_state *ds)
152 uint32_t num, last, i, first = 0;
153 const struct object_id *current = NULL;
156 num = p->num_objects;
158 while (first < last) {
159 uint32_t mid = (first + last) / 2;
160 const unsigned char *current;
163 current = nth_packed_object_sha1(p, mid);
164 cmp = hashcmp(ds->bin_pfx.hash, current);
177 * At this point, "first" is the location of the lowest object
178 * with an object name that could match "bin_pfx". See if we have
179 * 0, 1 or more objects that actually match(es).
181 for (i = first; i < num && !ds->ambiguous; i++) {
182 struct object_id oid;
183 current = nth_packed_object_oid(&oid, p, i);
184 if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))
186 update_candidates(ds, current);
190 static void find_short_packed_object(struct disambiguate_state *ds)
192 struct packed_git *p;
194 prepare_packed_git();
195 for (p = packed_git; p && !ds->ambiguous; p = p->next)
196 unique_in_pack(p, ds);
199 #define SHORT_NAME_NOT_FOUND (-1)
200 #define SHORT_NAME_AMBIGUOUS (-2)
202 static int finish_object_disambiguation(struct disambiguate_state *ds,
206 return SHORT_NAME_AMBIGUOUS;
208 if (!ds->candidate_exists)
209 return SHORT_NAME_NOT_FOUND;
211 if (!ds->candidate_checked)
213 * If this is the only candidate, there is no point
214 * calling the disambiguation hint callback.
216 * On the other hand, if the current candidate
217 * replaced an earlier candidate that did _not_ pass
218 * the disambiguation hint callback, then we do have
219 * more than one objects that match the short name
220 * given, so we should make sure this one matches;
221 * otherwise, if we discovered this one and the one
222 * that we previously discarded in the reverse order,
223 * we would end up showing different results in the
226 ds->candidate_ok = (!ds->disambiguate_fn_used ||
227 ds->fn(&ds->candidate, ds->cb_data));
229 if (!ds->candidate_ok)
230 return SHORT_NAME_AMBIGUOUS;
232 hashcpy(sha1, ds->candidate.hash);
236 static int disambiguate_commit_only(const struct object_id *oid, void *cb_data_unused)
238 int kind = sha1_object_info(oid->hash, NULL);
239 return kind == OBJ_COMMIT;
242 static int disambiguate_committish_only(const struct object_id *oid, void *cb_data_unused)
247 kind = sha1_object_info(oid->hash, NULL);
248 if (kind == OBJ_COMMIT)
253 /* We need to do this the hard way... */
254 obj = deref_tag(parse_object(oid), NULL, 0);
255 if (obj && obj->type == OBJ_COMMIT)
260 static int disambiguate_tree_only(const struct object_id *oid, void *cb_data_unused)
262 int kind = sha1_object_info(oid->hash, NULL);
263 return kind == OBJ_TREE;
266 static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_unused)
271 kind = sha1_object_info(oid->hash, NULL);
272 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
277 /* We need to do this the hard way... */
278 obj = deref_tag(parse_object(oid), NULL, 0);
279 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
284 static int disambiguate_blob_only(const struct object_id *oid, void *cb_data_unused)
286 int kind = sha1_object_info(oid->hash, NULL);
287 return kind == OBJ_BLOB;
290 static disambiguate_hint_fn default_disambiguate_hint;
292 int set_disambiguate_hint_config(const char *var, const char *value)
294 static const struct {
296 disambiguate_hint_fn fn;
299 { "commit", disambiguate_commit_only },
300 { "committish", disambiguate_committish_only },
301 { "tree", disambiguate_tree_only },
302 { "treeish", disambiguate_treeish_only },
303 { "blob", disambiguate_blob_only }
308 return config_error_nonbool(var);
310 for (i = 0; i < ARRAY_SIZE(hints); i++) {
311 if (!strcasecmp(value, hints[i].name)) {
312 default_disambiguate_hint = hints[i].fn;
317 return error("unknown hint type for '%s': %s", var, value);
320 static int init_object_disambiguation(const char *name, int len,
321 struct disambiguate_state *ds)
325 if (len < MINIMUM_ABBREV || len > GIT_SHA1_HEXSZ)
328 memset(ds, 0, sizeof(*ds));
330 for (i = 0; i < len ;i++) {
331 unsigned char c = name[i];
333 if (c >= '0' && c <= '9')
335 else if (c >= 'a' && c <= 'f')
337 else if (c >= 'A' && c <='F') {
346 ds->bin_pfx.hash[i >> 1] |= val;
350 ds->hex_pfx[len] = '\0';
355 static int show_ambiguous_object(const struct object_id *oid, void *data)
357 const struct disambiguate_state *ds = data;
358 struct strbuf desc = STRBUF_INIT;
362 if (ds->fn && !ds->fn(oid, ds->cb_data))
365 type = sha1_object_info(oid->hash, NULL);
366 if (type == OBJ_COMMIT) {
367 struct commit *commit = lookup_commit(oid);
369 struct pretty_print_context pp = {0};
370 pp.date_mode.type = DATE_SHORT;
371 format_commit_message(commit, " %ad - %s", &desc, &pp);
373 } else if (type == OBJ_TAG) {
374 struct tag *tag = lookup_tag(oid);
375 if (!parse_tag(tag) && tag->tag)
376 strbuf_addf(&desc, " %s", tag->tag);
380 find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
381 typename(type) ? typename(type) : "unknown type",
384 strbuf_release(&desc);
388 static int get_short_sha1(const char *name, int len, unsigned char *sha1,
392 struct disambiguate_state ds;
393 int quietly = !!(flags & GET_SHA1_QUIETLY);
395 if (init_object_disambiguation(name, len, &ds) < 0)
398 if (HAS_MULTI_BITS(flags & GET_SHA1_DISAMBIGUATORS))
399 die("BUG: multiple get_short_sha1 disambiguator flags");
401 if (flags & GET_SHA1_COMMIT)
402 ds.fn = disambiguate_commit_only;
403 else if (flags & GET_SHA1_COMMITTISH)
404 ds.fn = disambiguate_committish_only;
405 else if (flags & GET_SHA1_TREE)
406 ds.fn = disambiguate_tree_only;
407 else if (flags & GET_SHA1_TREEISH)
408 ds.fn = disambiguate_treeish_only;
409 else if (flags & GET_SHA1_BLOB)
410 ds.fn = disambiguate_blob_only;
412 ds.fn = default_disambiguate_hint;
414 find_short_object_filename(&ds);
415 find_short_packed_object(&ds);
416 status = finish_object_disambiguation(&ds, sha1);
418 if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
419 error(_("short SHA1 %s is ambiguous"), ds.hex_pfx);
422 * We may still have ambiguity if we simply saw a series of
423 * candidates that did not satisfy our hint function. In
424 * that case, we still want to show them, so disable the hint
430 advise(_("The candidates are:"));
431 for_each_abbrev(ds.hex_pfx, show_ambiguous_object, &ds);
437 static int collect_ambiguous(const struct object_id *oid, void *data)
439 oid_array_append(data, oid);
443 int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
445 struct oid_array collect = OID_ARRAY_INIT;
446 struct disambiguate_state ds;
449 if (init_object_disambiguation(prefix, strlen(prefix), &ds) < 0)
452 ds.always_call_fn = 1;
453 ds.fn = collect_ambiguous;
454 ds.cb_data = &collect;
455 find_short_object_filename(&ds);
456 find_short_packed_object(&ds);
458 ret = oid_array_for_each_unique(&collect, fn, cb_data);
459 oid_array_clear(&collect);
464 * Return the slot of the most-significant bit set in "val". There are various
465 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
466 * probably not a big deal here.
468 static unsigned msb(unsigned long val)
476 int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
481 unsigned long count = approximate_object_count();
483 * Add one because the MSB only tells us the highest bit set,
484 * not including the value of all the _other_ bits (so "15"
485 * is only one off of 2^4, but the MSB is the 3rd bit.
487 len = msb(count) + 1;
489 * We now know we have on the order of 2^len objects, which
490 * expects a collision at 2^(len/2). But we also care about hex
491 * chars, not bits, and there are 4 bits per hex. So all
492 * together we need to divide by 2; but we also want to round
493 * odd numbers up, hence adding one before dividing.
497 * For very small repos, we stick with our regular fallback.
499 if (len < FALLBACK_DEFAULT_ABBREV)
500 len = FALLBACK_DEFAULT_ABBREV;
503 sha1_to_hex_r(hex, sha1);
504 if (len == 40 || !len)
506 exists = has_sha1_file(sha1);
508 unsigned char sha1_ret[20];
509 status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
512 : status == SHORT_NAME_NOT_FOUND) {
521 const char *find_unique_abbrev(const unsigned char *sha1, int len)
524 static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
525 char *hex = hexbuffer[bufno];
526 bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
527 find_unique_abbrev_r(hex, sha1, len);
531 static int ambiguous_path(const char *path, int len)
536 for (cnt = 0; cnt < len; cnt++) {
556 static inline int at_mark(const char *string, int len,
557 const char **suffix, int nr)
561 for (i = 0; i < nr; i++) {
562 int suffix_len = strlen(suffix[i]);
563 if (suffix_len <= len
564 && !strncasecmp(string, suffix[i], suffix_len))
570 static inline int upstream_mark(const char *string, int len)
572 const char *suffix[] = { "@{upstream}", "@{u}" };
573 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
576 static inline int push_mark(const char *string, int len)
578 const char *suffix[] = { "@{push}" };
579 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
582 static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
583 static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
585 static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
588 static const char *warn_msg = "refname '%.*s' is ambiguous.";
589 static const char *object_name_msg = N_(
590 "Git normally never creates a ref that ends with 40 hex characters\n"
591 "because it will be ignored when you just specify 40-hex. These refs\n"
592 "may be created by mistake. For example,\n"
594 " git checkout -b $br $(git rev-parse ...)\n"
596 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
597 "examine these refs and maybe delete them. Turn this message off by\n"
598 "running \"git config advice.objectNameWarning false\"");
599 unsigned char tmp_sha1[20];
600 char *real_ref = NULL;
602 int at, reflog_len, nth_prior = 0;
604 if (len == 40 && !get_sha1_hex(str, sha1)) {
605 if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
606 refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
607 if (refs_found > 0) {
608 warning(warn_msg, len, str);
609 if (advice_object_name_warning)
610 fprintf(stderr, "%s\n", _(object_name_msg));
617 /* basic@{time or number or -number} format to query ref-log */
619 if (len && str[len-1] == '}') {
620 for (at = len-4; at >= 0; at--) {
621 if (str[at] == '@' && str[at+1] == '{') {
622 if (str[at+2] == '-') {
624 /* @{-N} not at start */
629 if (!upstream_mark(str + at, len - at) &&
630 !push_mark(str + at, len - at)) {
631 reflog_len = (len-1) - (at+2);
639 /* Accept only unambiguous ref paths. */
640 if (len && ambiguous_path(str, len))
644 struct strbuf buf = STRBUF_INIT;
647 if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
648 detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
649 strbuf_release(&buf);
655 if (!len && reflog_len)
656 /* allow "@{...}" to mean the current branch reflog */
657 refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
659 refs_found = dwim_log(str, len, sha1, &real_ref);
661 refs_found = dwim_ref(str, len, sha1, &real_ref);
666 if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) &&
668 !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
669 warning(warn_msg, len, str);
677 /* Is it asking for N-th entry, or approxidate? */
678 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
679 char ch = str[at+2+i];
680 if ('0' <= ch && ch <= '9')
681 nth = nth * 10 + ch - '0';
685 if (100000000 <= nth) {
692 char *tmp = xstrndup(str + at + 2, reflog_len);
693 at_time = approxidate_careful(tmp, &errors);
700 if (read_ref_at(real_ref, flags, at_time, nth, sha1, NULL,
701 &co_time, &co_tz, &co_cnt)) {
703 if (starts_with(real_ref, "refs/heads/")) {
705 len = strlen(real_ref + 11);
713 if (!(flags & GET_SHA1_QUIETLY)) {
714 warning("Log for '%.*s' only goes "
715 "back to %s.", len, str,
716 show_date(co_time, co_tz, DATE_MODE(RFC2822)));
719 if (flags & GET_SHA1_QUIETLY) {
722 die("Log for '%.*s' only has %d entries.",
732 static int get_parent(const char *name, int len,
733 unsigned char *result, int idx)
735 struct object_id oid;
736 int ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);
737 struct commit *commit;
738 struct commit_list *p;
742 commit = lookup_commit_reference(&oid);
743 if (parse_commit(commit))
746 hashcpy(result, commit->object.oid.hash);
752 hashcpy(result, p->item->object.oid.hash);
760 static int get_nth_ancestor(const char *name, int len,
761 unsigned char *result, int generation)
763 struct object_id oid;
764 struct commit *commit;
767 ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);
770 commit = lookup_commit_reference(&oid);
774 while (generation--) {
775 if (parse_commit(commit) || !commit->parents)
777 commit = commit->parents->item;
779 hashcpy(result, commit->object.oid.hash);
783 struct object *peel_to_type(const char *name, int namelen,
784 struct object *o, enum object_type expected_type)
786 if (name && !namelen)
787 namelen = strlen(name);
789 if (!o || (!o->parsed && !parse_object(&o->oid)))
791 if (expected_type == OBJ_ANY || o->type == expected_type)
793 if (o->type == OBJ_TAG)
794 o = ((struct tag*) o)->tagged;
795 else if (o->type == OBJ_COMMIT)
796 o = &(((struct commit *) o)->tree->object);
799 error("%.*s: expected %s type, but the object "
800 "dereferences to %s type",
801 namelen, name, typename(expected_type),
808 static int peel_onion(const char *name, int len, unsigned char *sha1,
809 unsigned lookup_flags)
811 struct object_id outer;
813 unsigned int expected_type = 0;
817 * "ref^{type}" dereferences ref repeatedly until you cannot
818 * dereference anymore, or you get an object of given type,
819 * whichever comes first. "ref^{}" means just dereference
820 * tags until you get a non-tag. "ref^0" is a shorthand for
821 * "ref^{commit}". "commit^{tree}" could be used to find the
822 * top-level tree of the given commit.
824 if (len < 4 || name[len-1] != '}')
827 for (sp = name + len - 1; name <= sp; sp--) {
829 if (ch == '{' && name < sp && sp[-1] == '^')
835 sp++; /* beginning of type name, or closing brace for empty */
836 if (starts_with(sp, "commit}"))
837 expected_type = OBJ_COMMIT;
838 else if (starts_with(sp, "tag}"))
839 expected_type = OBJ_TAG;
840 else if (starts_with(sp, "tree}"))
841 expected_type = OBJ_TREE;
842 else if (starts_with(sp, "blob}"))
843 expected_type = OBJ_BLOB;
844 else if (starts_with(sp, "object}"))
845 expected_type = OBJ_ANY;
846 else if (sp[0] == '}')
847 expected_type = OBJ_NONE;
848 else if (sp[0] == '/')
849 expected_type = OBJ_COMMIT;
853 lookup_flags &= ~GET_SHA1_DISAMBIGUATORS;
854 if (expected_type == OBJ_COMMIT)
855 lookup_flags |= GET_SHA1_COMMITTISH;
856 else if (expected_type == OBJ_TREE)
857 lookup_flags |= GET_SHA1_TREEISH;
859 if (get_sha1_1(name, sp - name - 2, outer.hash, lookup_flags))
862 o = parse_object(&outer);
865 if (!expected_type) {
866 o = deref_tag(o, name, sp - name - 2);
867 if (!o || (!o->parsed && !parse_object(&o->oid)))
869 hashcpy(sha1, o->oid.hash);
874 * At this point, the syntax look correct, so
875 * if we do not get the needed object, we should
878 o = peel_to_type(name, len, o, expected_type);
882 hashcpy(sha1, o->oid.hash);
884 /* "$commit^{/foo}" */
887 struct commit_list *list = NULL;
890 * $commit^{/}. Some regex implementation may reject.
891 * We don't need regex anyway. '' pattern always matches.
896 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
897 commit_list_insert((struct commit *)o, &list);
898 ret = get_sha1_oneline(prefix, sha1, list);
905 static int get_describe_name(const char *name, int len, unsigned char *sha1)
908 unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
910 for (cp = name + len - 1; name + 2 <= cp; cp--) {
913 /* We must be looking at g in "SOMETHING-g"
914 * for it to be describe output.
916 if (ch == 'g' && cp[-1] == '-') {
919 return get_short_sha1(cp, len, sha1, flags);
926 static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
932 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
935 for (cp = name + len - 1; name <= cp; cp--) {
937 if ('0' <= ch && ch <= '9')
939 if (ch == '~' || ch == '^')
946 int len1 = cp - name;
948 while (cp < name + len)
949 num = num * 10 + *cp++ - '0';
950 if (!num && len1 == len - 1)
952 if (has_suffix == '^')
953 return get_parent(name, len1, sha1, num);
954 /* else if (has_suffix == '~') -- goes without saying */
955 return get_nth_ancestor(name, len1, sha1, num);
958 ret = peel_onion(name, len, sha1, lookup_flags);
962 ret = get_sha1_basic(name, len, sha1, lookup_flags);
966 /* It could be describe output that is "SOMETHING-gXXXX" */
967 ret = get_describe_name(name, len, sha1);
971 return get_short_sha1(name, len, sha1, lookup_flags);
975 * This interprets names like ':/Initial revision of "git"' by searching
976 * through history and returning the first commit whose message starts
977 * the given regular expression.
979 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
981 * For a literal '!' character at the beginning of a pattern, you have to repeat
982 * that, like: ':/!!foo'
984 * For future extension, all other sequences beginning with ':/!' are reserved.
987 /* Remember to update object flag allocation in object.h */
988 #define ONELINE_SEEN (1u<<20)
990 static int handle_one_ref(const char *path, const struct object_id *oid,
991 int flag, void *cb_data)
993 struct commit_list **list = cb_data;
994 struct object *object = parse_object(oid);
997 if (object->type == OBJ_TAG) {
998 object = deref_tag(object, path, strlen(path));
1002 if (object->type != OBJ_COMMIT)
1004 commit_list_insert((struct commit *)object, list);
1008 static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
1009 struct commit_list *list)
1011 struct commit_list *backup = NULL, *l;
1016 if (prefix[0] == '!') {
1019 if (prefix[0] == '-') {
1022 } else if (prefix[0] != '!') {
1027 if (regcomp(®ex, prefix, REG_EXTENDED))
1030 for (l = list; l; l = l->next) {
1031 l->item->object.flags |= ONELINE_SEEN;
1032 commit_list_insert(l->item, &backup);
1035 const char *p, *buf;
1036 struct commit *commit;
1039 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
1040 if (!parse_object(&commit->object.oid))
1042 buf = get_commit_buffer(commit, NULL);
1043 p = strstr(buf, "\n\n");
1044 matches = negative ^ (p && !regexec(®ex, p + 2, 0, NULL, 0));
1045 unuse_commit_buffer(commit, buf);
1048 hashcpy(sha1, commit->object.oid.hash);
1054 free_commit_list(list);
1055 for (l = backup; l; l = l->next)
1056 clear_commit_marks(l->item, ONELINE_SEEN);
1057 free_commit_list(backup);
1058 return found ? 0 : -1;
1061 struct grab_nth_branch_switch_cbdata {
1066 static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid,
1067 const char *email, timestamp_t timestamp, int tz,
1068 const char *message, void *cb_data)
1070 struct grab_nth_branch_switch_cbdata *cb = cb_data;
1071 const char *match = NULL, *target = NULL;
1074 if (skip_prefix(message, "checkout: moving from ", &match))
1075 target = strstr(match, " to ");
1077 if (!match || !target)
1079 if (--(cb->remaining) == 0) {
1080 len = target - match;
1081 strbuf_reset(&cb->buf);
1082 strbuf_add(&cb->buf, match, len);
1083 return 1; /* we are done */
1089 * Parse @{-N} syntax, return the number of characters parsed
1090 * if successful; otherwise signal an error with negative value.
1092 static int interpret_nth_prior_checkout(const char *name, int namelen,
1097 struct grab_nth_branch_switch_cbdata cb;
1103 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
1105 brace = memchr(name, '}', namelen);
1108 nth = strtol(name + 3, &num_end, 10);
1109 if (num_end != brace)
1114 strbuf_init(&cb.buf, 20);
1117 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
1119 strbuf_addbuf(buf, &cb.buf);
1120 retval = brace - name + 1;
1123 strbuf_release(&cb.buf);
1127 int get_oid_mb(const char *name, struct object_id *oid)
1129 struct commit *one, *two;
1130 struct commit_list *mbs;
1131 struct object_id oid_tmp;
1135 dots = strstr(name, "...");
1137 return get_oid(name, oid);
1139 st = get_oid("HEAD", &oid_tmp);
1142 strbuf_init(&sb, dots - name);
1143 strbuf_add(&sb, name, dots - name);
1144 st = get_sha1_committish(sb.buf, oid_tmp.hash);
1145 strbuf_release(&sb);
1149 one = lookup_commit_reference_gently(&oid_tmp, 0);
1153 if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", oid_tmp.hash))
1155 two = lookup_commit_reference_gently(&oid_tmp, 0);
1158 mbs = get_merge_bases(one, two);
1159 if (!mbs || mbs->next)
1163 oidcpy(oid, &mbs->item->object.oid);
1165 free_commit_list(mbs);
1169 /* parse @something syntax, when 'something' is not {.*} */
1170 static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1174 if (len || name[1] == '{')
1177 /* make sure it's a single @, or @@{.*}, not @foo */
1178 next = memchr(name + len + 1, '@', namelen - len - 1);
1179 if (next && next[1] != '{')
1182 next = name + namelen;
1183 if (next != name + 1)
1187 strbuf_add(buf, "HEAD", 4);
1191 static int reinterpret(const char *name, int namelen, int len,
1192 struct strbuf *buf, unsigned allowed)
1194 /* we have extra data, which might need further processing */
1195 struct strbuf tmp = STRBUF_INIT;
1196 int used = buf->len;
1199 strbuf_add(buf, name + len, namelen - len);
1200 ret = interpret_branch_name(buf->buf, buf->len, &tmp, allowed);
1201 /* that data was not interpreted, remove our cruft */
1203 strbuf_setlen(buf, used);
1207 strbuf_addbuf(buf, &tmp);
1208 strbuf_release(&tmp);
1209 /* tweak for size of {-N} versus expanded ref name */
1210 return ret - used + len;
1213 static void set_shortened_ref(struct strbuf *buf, const char *ref)
1215 char *s = shorten_unambiguous_ref(ref, 0);
1217 strbuf_addstr(buf, s);
1221 static int branch_interpret_allowed(const char *refname, unsigned allowed)
1226 if ((allowed & INTERPRET_BRANCH_LOCAL) &&
1227 starts_with(refname, "refs/heads/"))
1229 if ((allowed & INTERPRET_BRANCH_REMOTE) &&
1230 starts_with(refname, "refs/remotes/"))
1236 static int interpret_branch_mark(const char *name, int namelen,
1237 int at, struct strbuf *buf,
1238 int (*get_mark)(const char *, int),
1239 const char *(*get_data)(struct branch *,
1244 struct branch *branch;
1245 struct strbuf err = STRBUF_INIT;
1248 len = get_mark(name + at, namelen - at);
1252 if (memchr(name, ':', at))
1256 char *name_str = xmemdupz(name, at);
1257 branch = branch_get(name_str);
1260 branch = branch_get(NULL);
1262 value = get_data(branch, &err);
1266 if (!branch_interpret_allowed(value, allowed))
1269 set_shortened_ref(buf, value);
1273 int interpret_branch_name(const char *name, int namelen, struct strbuf *buf,
1281 namelen = strlen(name);
1283 if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) {
1284 len = interpret_nth_prior_checkout(name, namelen, buf);
1286 return len; /* syntax Ok, not enough switches */
1287 } else if (len > 0) {
1289 return len; /* consumed all */
1291 return reinterpret(name, namelen, len, buf, allowed);
1296 (at = memchr(start, '@', namelen - (start - name)));
1299 if (!allowed || (allowed & INTERPRET_BRANCH_HEAD)) {
1300 len = interpret_empty_at(name, namelen, at - name, buf);
1302 return reinterpret(name, namelen, len, buf,
1306 len = interpret_branch_mark(name, namelen, at - name, buf,
1307 upstream_mark, branch_get_upstream,
1312 len = interpret_branch_mark(name, namelen, at - name, buf,
1313 push_mark, branch_get_push,
1322 void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
1324 int len = strlen(name);
1325 int used = interpret_branch_name(name, len, sb, allowed);
1329 strbuf_add(sb, name + used, len - used);
1332 int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1334 strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
1337 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
1338 return check_refname_format(sb->buf, 0);
1342 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1343 * notably "xyz^" for "parent of xyz"
1345 int get_sha1(const char *name, unsigned char *sha1)
1347 struct object_context unused;
1348 return get_sha1_with_context(name, 0, sha1, &unused);
1352 * This is like "get_sha1()", but for struct object_id.
1354 int get_oid(const char *name, struct object_id *oid)
1356 return get_sha1(name, oid->hash);
1361 * Many callers know that the user meant to name a commit-ish by
1362 * syntactical positions where the object name appears. Calling this
1363 * function allows the machinery to disambiguate shorter-than-unique
1364 * abbreviated object names between commit-ish and others.
1366 * Note that this does NOT error out when the named object is not a
1367 * commit-ish. It is merely to give a hint to the disambiguation
1370 int get_sha1_committish(const char *name, unsigned char *sha1)
1372 struct object_context unused;
1373 return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
1377 int get_sha1_treeish(const char *name, unsigned char *sha1)
1379 struct object_context unused;
1380 return get_sha1_with_context(name, GET_SHA1_TREEISH,
1384 int get_sha1_commit(const char *name, unsigned char *sha1)
1386 struct object_context unused;
1387 return get_sha1_with_context(name, GET_SHA1_COMMIT,
1391 int get_sha1_tree(const char *name, unsigned char *sha1)
1393 struct object_context unused;
1394 return get_sha1_with_context(name, GET_SHA1_TREE,
1398 int get_sha1_blob(const char *name, unsigned char *sha1)
1400 struct object_context unused;
1401 return get_sha1_with_context(name, GET_SHA1_BLOB,
1405 /* Must be called only when object_name:filename doesn't exist. */
1406 static void diagnose_invalid_sha1_path(const char *prefix,
1407 const char *filename,
1408 const unsigned char *tree_sha1,
1409 const char *object_name,
1410 int object_name_len)
1412 unsigned char sha1[20];
1418 if (file_exists(filename))
1419 die("Path '%s' exists on disk, but not in '%.*s'.",
1420 filename, object_name_len, object_name);
1421 if (is_missing_file_error(errno)) {
1422 char *fullname = xstrfmt("%s%s", prefix, filename);
1424 if (!get_tree_entry(tree_sha1, fullname,
1426 die("Path '%s' exists, but not '%s'.\n"
1427 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
1430 object_name_len, object_name,
1432 object_name_len, object_name,
1435 die("Path '%s' does not exist in '%.*s'",
1436 filename, object_name_len, object_name);
1440 /* Must be called only when :stage:filename doesn't exist. */
1441 static void diagnose_invalid_index_path(int stage,
1443 const char *filename)
1445 const struct cache_entry *ce;
1447 unsigned namelen = strlen(filename);
1448 struct strbuf fullname = STRBUF_INIT;
1453 /* Wrong stage number? */
1454 pos = cache_name_pos(filename, namelen);
1457 if (pos < active_nr) {
1458 ce = active_cache[pos];
1459 if (ce_namelen(ce) == namelen &&
1460 !memcmp(ce->name, filename, namelen))
1461 die("Path '%s' is in the index, but not at stage %d.\n"
1462 "Did you mean ':%d:%s'?",
1464 ce_stage(ce), filename);
1467 /* Confusion between relative and absolute filenames? */
1468 strbuf_addstr(&fullname, prefix);
1469 strbuf_addstr(&fullname, filename);
1470 pos = cache_name_pos(fullname.buf, fullname.len);
1473 if (pos < active_nr) {
1474 ce = active_cache[pos];
1475 if (ce_namelen(ce) == fullname.len &&
1476 !memcmp(ce->name, fullname.buf, fullname.len))
1477 die("Path '%s' is in the index, but not '%s'.\n"
1478 "Did you mean ':%d:%s' aka ':%d:./%s'?",
1479 fullname.buf, filename,
1480 ce_stage(ce), fullname.buf,
1481 ce_stage(ce), filename);
1484 if (file_exists(filename))
1485 die("Path '%s' exists on disk, but not in the index.", filename);
1486 if (is_missing_file_error(errno))
1487 die("Path '%s' does not exist (neither on disk nor in the index).",
1490 strbuf_release(&fullname);
1494 static char *resolve_relative_path(const char *rel)
1496 if (!starts_with(rel, "./") && !starts_with(rel, "../"))
1499 if (!is_inside_work_tree())
1500 die("relative path syntax can't be used outside working tree.");
1502 /* die() inside prefix_path() if resolved path is outside worktree */
1503 return prefix_path(startup_info->prefix,
1504 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1508 static int get_sha1_with_context_1(const char *name,
1511 unsigned char *sha1,
1512 struct object_context *oc)
1514 int ret, bracket_depth;
1515 int namelen = strlen(name);
1517 int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
1520 flags |= GET_SHA1_QUIETLY;
1522 memset(oc, 0, sizeof(*oc));
1523 oc->mode = S_IFINVALID;
1524 strbuf_init(&oc->symlink_path, 0);
1525 ret = get_sha1_1(name, namelen, sha1, flags);
1529 * sha1:path --> object name of path in ent sha1
1530 * :path -> object name of absolute path in index
1531 * :./path -> object name of path relative to cwd in index
1532 * :[0-3]:path -> object name of path in index at stage
1533 * :/foo -> recent commit matching foo
1535 if (name[0] == ':') {
1537 const struct cache_entry *ce;
1538 char *new_path = NULL;
1540 if (!only_to_die && namelen > 2 && name[1] == '/') {
1541 struct commit_list *list = NULL;
1543 for_each_ref(handle_one_ref, &list);
1544 commit_list_sort_by_date(&list);
1545 return get_sha1_oneline(name + 2, sha1, list);
1549 name[1] < '0' || '3' < name[1])
1552 stage = name[1] - '0';
1555 new_path = resolve_relative_path(cp);
1557 namelen = namelen - (cp - name);
1560 namelen = strlen(cp);
1563 if (flags & GET_SHA1_RECORD_PATH)
1564 oc->path = xstrdup(cp);
1568 pos = cache_name_pos(cp, namelen);
1571 while (pos < active_nr) {
1572 ce = active_cache[pos];
1573 if (ce_namelen(ce) != namelen ||
1574 memcmp(ce->name, cp, namelen))
1576 if (ce_stage(ce) == stage) {
1577 hashcpy(sha1, ce->oid.hash);
1578 oc->mode = ce->ce_mode;
1584 if (only_to_die && name[1] && name[1] != '/')
1585 diagnose_invalid_index_path(stage, prefix, cp);
1589 for (cp = name, bracket_depth = 0; *cp; cp++) {
1592 else if (bracket_depth && *cp == '}')
1594 else if (!bracket_depth && *cp == ':')
1598 unsigned char tree_sha1[20];
1599 int len = cp - name;
1600 unsigned sub_flags = flags;
1602 sub_flags &= ~GET_SHA1_DISAMBIGUATORS;
1603 sub_flags |= GET_SHA1_TREEISH;
1605 if (!get_sha1_1(name, len, tree_sha1, sub_flags)) {
1606 const char *filename = cp+1;
1607 char *new_filename = NULL;
1609 new_filename = resolve_relative_path(filename);
1611 filename = new_filename;
1612 if (flags & GET_SHA1_FOLLOW_SYMLINKS) {
1613 ret = get_tree_entry_follow_symlinks(tree_sha1,
1614 filename, sha1, &oc->symlink_path,
1617 ret = get_tree_entry(tree_sha1, filename,
1619 if (ret && only_to_die) {
1620 diagnose_invalid_sha1_path(prefix,
1626 hashcpy(oc->tree, tree_sha1);
1627 if (flags & GET_SHA1_RECORD_PATH)
1628 oc->path = xstrdup(filename);
1634 die("Invalid object name '%.*s'.", len, name);
1641 * Call this function when you know "name" given by the end user must
1642 * name an object but it doesn't; the function _may_ die with a better
1643 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1644 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1645 * you have a chance to diagnose the error further.
1647 void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
1649 struct object_context oc;
1650 unsigned char sha1[20];
1651 get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
1654 int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *oc)
1656 if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
1657 die("BUG: incompatible flags for get_sha1_with_context");
1658 return get_sha1_with_context_1(str, flags, NULL, sha1, oc);