10 static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
12 typedef int (*disambiguate_hint_fn)(const unsigned char *, void *);
14 struct disambiguate_state {
15 disambiguate_hint_fn fn;
17 unsigned char candidate[20];
18 unsigned candidate_exists:1;
19 unsigned candidate_checked:1;
20 unsigned candidate_ok:1;
21 unsigned disambiguate_fn_used:1;
23 unsigned always_call_fn:1;
26 static void update_candidates(struct disambiguate_state *ds, const unsigned char *current)
28 if (ds->always_call_fn) {
29 ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;
32 if (!ds->candidate_exists) {
33 /* this is the first candidate */
34 hashcpy(ds->candidate, current);
35 ds->candidate_exists = 1;
37 } else if (!hashcmp(ds->candidate, current)) {
38 /* the same as what we already have seen */
43 /* cannot disambiguate between ds->candidate and current */
48 if (!ds->candidate_checked) {
49 ds->candidate_ok = ds->fn(ds->candidate, ds->cb_data);
50 ds->disambiguate_fn_used = 1;
51 ds->candidate_checked = 1;
54 if (!ds->candidate_ok) {
55 /* discard the candidate; we know it does not satisify fn */
56 hashcpy(ds->candidate, current);
57 ds->candidate_checked = 0;
61 /* if we reach this point, we know ds->candidate satisfies fn */
62 if (ds->fn(current, ds->cb_data)) {
64 * if both current and candidate satisfy fn, we cannot
71 /* otherwise, current can be discarded and candidate is still good */
74 static void find_short_object_filename(int len, const char *hex_pfx, struct disambiguate_state *ds)
76 struct alternate_object_database *alt;
78 static struct alternate_object_database *fakeent;
82 * Create a "fake" alternate object database that
83 * points to our own object database, to make it
84 * easier to get a temporary working space in
85 * alt->name/alt->base while iterating over the
86 * object databases including our own.
88 const char *objdir = get_object_directory();
89 int objdir_len = strlen(objdir);
90 int entlen = objdir_len + 43;
91 fakeent = xmalloc(sizeof(*fakeent) + entlen);
92 memcpy(fakeent->base, objdir, objdir_len);
93 fakeent->name = fakeent->base + objdir_len + 1;
94 fakeent->name[-1] = '/';
96 fakeent->next = alt_odb_list;
98 sprintf(hex, "%.2s", hex_pfx);
99 for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) {
102 sprintf(alt->name, "%.2s/", hex_pfx);
103 dir = opendir(alt->base);
107 while (!ds->ambiguous && (de = readdir(dir)) != NULL) {
108 unsigned char sha1[20];
110 if (strlen(de->d_name) != 38)
112 if (memcmp(de->d_name, hex_pfx + 2, len - 2))
114 memcpy(hex + 2, de->d_name, 38);
115 if (!get_sha1_hex(hex, sha1))
116 update_candidates(ds, sha1);
122 static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
132 if ((*a ^ *b) & 0xf0)
137 static void unique_in_pack(int len,
138 const unsigned char *bin_pfx,
139 struct packed_git *p,
140 struct disambiguate_state *ds)
142 uint32_t num, last, i, first = 0;
143 const unsigned char *current = NULL;
146 num = p->num_objects;
148 while (first < last) {
149 uint32_t mid = (first + last) / 2;
150 const unsigned char *current;
153 current = nth_packed_object_sha1(p, mid);
154 cmp = hashcmp(bin_pfx, current);
167 * At this point, "first" is the location of the lowest object
168 * with an object name that could match "bin_pfx". See if we have
169 * 0, 1 or more objects that actually match(es).
171 for (i = first; i < num && !ds->ambiguous; i++) {
172 current = nth_packed_object_sha1(p, i);
173 if (!match_sha(len, bin_pfx, current))
175 update_candidates(ds, current);
179 static void find_short_packed_object(int len, const unsigned char *bin_pfx,
180 struct disambiguate_state *ds)
182 struct packed_git *p;
184 prepare_packed_git();
185 for (p = packed_git; p && !ds->ambiguous; p = p->next)
186 unique_in_pack(len, bin_pfx, p, ds);
189 #define SHORT_NAME_NOT_FOUND (-1)
190 #define SHORT_NAME_AMBIGUOUS (-2)
192 static int finish_object_disambiguation(struct disambiguate_state *ds,
196 return SHORT_NAME_AMBIGUOUS;
198 if (!ds->candidate_exists)
199 return SHORT_NAME_NOT_FOUND;
201 if (!ds->candidate_checked)
203 * If this is the only candidate, there is no point
204 * calling the disambiguation hint callback.
206 * On the other hand, if the current candidate
207 * replaced an earlier candidate that did _not_ pass
208 * the disambiguation hint callback, then we do have
209 * more than one objects that match the short name
210 * given, so we should make sure this one matches;
211 * otherwise, if we discovered this one and the one
212 * that we previously discarded in the reverse order,
213 * we would end up showing different results in the
216 ds->candidate_ok = (!ds->disambiguate_fn_used ||
217 ds->fn(ds->candidate, ds->cb_data));
219 if (!ds->candidate_ok)
220 return SHORT_NAME_AMBIGUOUS;
222 hashcpy(sha1, ds->candidate);
226 static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused)
228 int kind = sha1_object_info(sha1, NULL);
229 return kind == OBJ_COMMIT;
232 static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data_unused)
237 kind = sha1_object_info(sha1, NULL);
238 if (kind == OBJ_COMMIT)
243 /* We need to do this the hard way... */
244 obj = deref_tag(lookup_object(sha1), NULL, 0);
245 if (obj && obj->type == OBJ_COMMIT)
250 static int disambiguate_tree_only(const unsigned char *sha1, void *cb_data_unused)
252 int kind = sha1_object_info(sha1, NULL);
253 return kind == OBJ_TREE;
256 static int disambiguate_treeish_only(const unsigned char *sha1, void *cb_data_unused)
261 kind = sha1_object_info(sha1, NULL);
262 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
267 /* We need to do this the hard way... */
268 obj = deref_tag(lookup_object(sha1), NULL, 0);
269 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
274 static int disambiguate_blob_only(const unsigned char *sha1, void *cb_data_unused)
276 int kind = sha1_object_info(sha1, NULL);
277 return kind == OBJ_BLOB;
280 static int prepare_prefixes(const char *name, int len,
281 unsigned char *bin_pfx,
287 memset(hex_pfx, 'x', 40);
288 for (i = 0; i < len ;i++) {
289 unsigned char c = name[i];
291 if (c >= '0' && c <= '9')
293 else if (c >= 'a' && c <= 'f')
295 else if (c >= 'A' && c <='F') {
304 bin_pfx[i >> 1] |= val;
309 static int get_short_sha1(const char *name, int len, unsigned char *sha1,
314 unsigned char bin_pfx[20];
315 struct disambiguate_state ds;
316 int quietly = !!(flags & GET_SHA1_QUIETLY);
318 if (len < MINIMUM_ABBREV || len > 40)
320 if (prepare_prefixes(name, len, bin_pfx, hex_pfx) < 0)
325 memset(&ds, 0, sizeof(ds));
326 if (flags & GET_SHA1_COMMIT)
327 ds.fn = disambiguate_commit_only;
328 else if (flags & GET_SHA1_COMMITTISH)
329 ds.fn = disambiguate_committish_only;
330 else if (flags & GET_SHA1_TREE)
331 ds.fn = disambiguate_tree_only;
332 else if (flags & GET_SHA1_TREEISH)
333 ds.fn = disambiguate_treeish_only;
334 else if (flags & GET_SHA1_BLOB)
335 ds.fn = disambiguate_blob_only;
337 find_short_object_filename(len, hex_pfx, &ds);
338 find_short_packed_object(len, bin_pfx, &ds);
339 status = finish_object_disambiguation(&ds, sha1);
341 if (!quietly && (status == SHORT_NAME_AMBIGUOUS))
342 return error("short SHA1 %.*s is ambiguous.", len, hex_pfx);
347 int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
350 unsigned char bin_pfx[20];
351 struct disambiguate_state ds;
352 int len = strlen(prefix);
354 if (len < MINIMUM_ABBREV || len > 40)
356 if (prepare_prefixes(prefix, len, bin_pfx, hex_pfx) < 0)
361 memset(&ds, 0, sizeof(ds));
362 ds.always_call_fn = 1;
363 ds.cb_data = cb_data;
366 find_short_object_filename(len, hex_pfx, &ds);
367 find_short_packed_object(len, bin_pfx, &ds);
371 const char *find_unique_abbrev(const unsigned char *sha1, int len)
376 exists = has_sha1_file(sha1);
377 memcpy(hex, sha1_to_hex(sha1), 40);
378 if (len == 40 || !len)
381 unsigned char sha1_ret[20];
382 status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
385 : status == SHORT_NAME_NOT_FOUND) {
394 static int ambiguous_path(const char *path, int len)
399 for (cnt = 0; cnt < len; cnt++) {
419 static inline int upstream_mark(const char *string, int len)
421 const char *suffix[] = { "@{upstream}", "@{u}" };
424 for (i = 0; i < ARRAY_SIZE(suffix); i++) {
425 int suffix_len = strlen(suffix[i]);
426 if (suffix_len <= len
427 && !memcmp(string, suffix[i], suffix_len))
433 static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
435 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
437 static const char *warn_msg = "refname '%.*s' is ambiguous.";
438 static const char *object_name_msg = N_(
439 "Git normally never creates a ref that ends with 40 hex characters\n"
440 "because it will be ignored when you just specify 40-hex. These refs\n"
441 "may be created by mistake. For example,\n"
443 " git checkout -b $br $(git rev-parse ...)\n"
445 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
446 "examine these refs and maybe delete them. Turn this message off by\n"
447 "running \"git config advice.object_name_warning false\"");
448 unsigned char tmp_sha1[20];
449 char *real_ref = NULL;
453 if (len == 40 && !get_sha1_hex(str, sha1)) {
454 refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
455 if (refs_found > 0 && warn_ambiguous_refs) {
456 warning(warn_msg, len, str);
457 if (advice_object_name_warning)
458 fprintf(stderr, "%s\n", _(object_name_msg));
464 /* basic@{time or number or -number} format to query ref-log */
466 if (len && str[len-1] == '}') {
467 for (at = len-2; at >= 0; at--) {
468 if (str[at] == '@' && str[at+1] == '{') {
469 if (!upstream_mark(str + at, len - at)) {
470 reflog_len = (len-1) - (at+2);
478 /* Accept only unambiguous ref paths. */
479 if (len && ambiguous_path(str, len))
482 if (!len && reflog_len) {
483 struct strbuf buf = STRBUF_INIT;
485 /* try the @{-N} syntax for n-th checkout */
486 ret = interpret_branch_name(str+at, &buf);
488 /* substitute this branch name and restart */
489 return get_sha1_1(buf.buf, buf.len, sha1, 0);
490 } else if (ret == 0) {
493 /* allow "@{...}" to mean the current branch reflog */
494 refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
495 } else if (reflog_len)
496 refs_found = dwim_log(str, len, sha1, &real_ref);
498 refs_found = dwim_ref(str, len, sha1, &real_ref);
503 if (warn_ambiguous_refs &&
505 !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
506 warning(warn_msg, len, str);
510 unsigned long at_time;
511 unsigned long co_time;
514 /* a @{-N} placed anywhere except the start is an error */
515 if (str[at+2] == '-')
518 /* Is it asking for N-th entry, or approxidate? */
519 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
520 char ch = str[at+2+i];
521 if ('0' <= ch && ch <= '9')
522 nth = nth * 10 + ch - '0';
526 if (100000000 <= nth) {
533 char *tmp = xstrndup(str + at + 2, reflog_len);
534 at_time = approxidate_careful(tmp, &errors);
539 if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
540 &co_time, &co_tz, &co_cnt)) {
542 warning("Log for '%.*s' only goes "
543 "back to %s.", len, str,
544 show_date(co_time, co_tz, DATE_RFC2822));
547 die("Log for '%.*s' only has %d entries.",
557 static int get_parent(const char *name, int len,
558 unsigned char *result, int idx)
560 unsigned char sha1[20];
561 int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
562 struct commit *commit;
563 struct commit_list *p;
567 commit = lookup_commit_reference(sha1);
570 if (parse_commit(commit))
573 hashcpy(result, commit->object.sha1);
579 hashcpy(result, p->item->object.sha1);
587 static int get_nth_ancestor(const char *name, int len,
588 unsigned char *result, int generation)
590 unsigned char sha1[20];
591 struct commit *commit;
594 ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
597 commit = lookup_commit_reference(sha1);
601 while (generation--) {
602 if (parse_commit(commit) || !commit->parents)
604 commit = commit->parents->item;
606 hashcpy(result, commit->object.sha1);
610 struct object *peel_to_type(const char *name, int namelen,
611 struct object *o, enum object_type expected_type)
613 if (name && !namelen)
614 namelen = strlen(name);
616 if (!o || (!o->parsed && !parse_object(o->sha1)))
618 if (o->type == expected_type)
620 if (o->type == OBJ_TAG)
621 o = ((struct tag*) o)->tagged;
622 else if (o->type == OBJ_COMMIT)
623 o = &(((struct commit *) o)->tree->object);
626 error("%.*s: expected %s type, but the object "
627 "dereferences to %s type",
628 namelen, name, typename(expected_type),
635 static int peel_onion(const char *name, int len, unsigned char *sha1)
637 unsigned char outer[20];
639 unsigned int expected_type = 0;
640 unsigned lookup_flags = 0;
644 * "ref^{type}" dereferences ref repeatedly until you cannot
645 * dereference anymore, or you get an object of given type,
646 * whichever comes first. "ref^{}" means just dereference
647 * tags until you get a non-tag. "ref^0" is a shorthand for
648 * "ref^{commit}". "commit^{tree}" could be used to find the
649 * top-level tree of the given commit.
651 if (len < 4 || name[len-1] != '}')
654 for (sp = name + len - 1; name <= sp; sp--) {
656 if (ch == '{' && name < sp && sp[-1] == '^')
662 sp++; /* beginning of type name, or closing brace for empty */
663 if (!strncmp(commit_type, sp, 6) && sp[6] == '}')
664 expected_type = OBJ_COMMIT;
665 else if (!strncmp(tree_type, sp, 4) && sp[4] == '}')
666 expected_type = OBJ_TREE;
667 else if (!strncmp(blob_type, sp, 4) && sp[4] == '}')
668 expected_type = OBJ_BLOB;
669 else if (sp[0] == '}')
670 expected_type = OBJ_NONE;
671 else if (sp[0] == '/')
672 expected_type = OBJ_COMMIT;
676 if (expected_type == OBJ_COMMIT)
677 lookup_flags = GET_SHA1_COMMITTISH;
679 if (get_sha1_1(name, sp - name - 2, outer, lookup_flags))
682 o = parse_object(outer);
685 if (!expected_type) {
686 o = deref_tag(o, name, sp - name - 2);
687 if (!o || (!o->parsed && !parse_object(o->sha1)))
689 hashcpy(sha1, o->sha1);
694 * At this point, the syntax look correct, so
695 * if we do not get the needed object, we should
698 o = peel_to_type(name, len, o, expected_type);
702 hashcpy(sha1, o->sha1);
704 /* "$commit^{/foo}" */
707 struct commit_list *list = NULL;
710 * $commit^{/}. Some regex implementation may reject.
711 * We don't need regex anyway. '' pattern always matches.
716 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
717 commit_list_insert((struct commit *)o, &list);
718 ret = get_sha1_oneline(prefix, sha1, list);
725 static int get_describe_name(const char *name, int len, unsigned char *sha1)
728 unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
730 for (cp = name + len - 1; name + 2 <= cp; cp--) {
732 if (hexval(ch) & ~0377) {
733 /* We must be looking at g in "SOMETHING-g"
734 * for it to be describe output.
736 if (ch == 'g' && cp[-1] == '-') {
739 return get_short_sha1(cp, len, sha1, flags);
746 static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
752 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
755 for (cp = name + len - 1; name <= cp; cp--) {
757 if ('0' <= ch && ch <= '9')
759 if (ch == '~' || ch == '^')
766 int len1 = cp - name;
768 while (cp < name + len)
769 num = num * 10 + *cp++ - '0';
770 if (!num && len1 == len - 1)
772 if (has_suffix == '^')
773 return get_parent(name, len1, sha1, num);
774 /* else if (has_suffix == '~') -- goes without saying */
775 return get_nth_ancestor(name, len1, sha1, num);
778 ret = peel_onion(name, len, sha1);
782 ret = get_sha1_basic(name, len, sha1);
786 /* It could be describe output that is "SOMETHING-gXXXX" */
787 ret = get_describe_name(name, len, sha1);
791 return get_short_sha1(name, len, sha1, lookup_flags);
795 * This interprets names like ':/Initial revision of "git"' by searching
796 * through history and returning the first commit whose message starts
797 * the given regular expression.
799 * For future extension, ':/!' is reserved. If you want to match a message
800 * beginning with a '!', you have to repeat the exclamation mark.
802 #define ONELINE_SEEN (1u<<20)
804 static int handle_one_ref(const char *path,
805 const unsigned char *sha1, int flag, void *cb_data)
807 struct commit_list **list = cb_data;
808 struct object *object = parse_object(sha1);
811 if (object->type == OBJ_TAG) {
812 object = deref_tag(object, path, strlen(path));
816 if (object->type != OBJ_COMMIT)
818 commit_list_insert_by_date((struct commit *)object, list);
822 static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
823 struct commit_list *list)
825 struct commit_list *backup = NULL, *l;
829 if (prefix[0] == '!') {
830 if (prefix[1] != '!')
831 die ("Invalid search pattern: %s", prefix);
835 if (regcomp(®ex, prefix, REG_EXTENDED))
836 die("Invalid search pattern: %s", prefix);
838 for (l = list; l; l = l->next) {
839 l->item->object.flags |= ONELINE_SEEN;
840 commit_list_insert(l->item, &backup);
843 char *p, *to_free = NULL;
844 struct commit *commit;
845 enum object_type type;
849 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
850 if (!parse_object(commit->object.sha1))
855 p = read_sha1_file(commit->object.sha1, &type, &size);
861 p = strstr(p, "\n\n");
862 matches = p && !regexec(®ex, p + 2, 0, NULL, 0);
866 hashcpy(sha1, commit->object.sha1);
872 free_commit_list(list);
873 for (l = backup; l; l = l->next)
874 clear_commit_marks(l->item, ONELINE_SEEN);
875 free_commit_list(backup);
876 return found ? 0 : -1;
879 struct grab_nth_branch_switch_cbdata {
884 static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
885 const char *email, unsigned long timestamp, int tz,
886 const char *message, void *cb_data)
888 struct grab_nth_branch_switch_cbdata *cb = cb_data;
889 const char *match = NULL, *target = NULL;
893 if (!prefixcmp(message, "checkout: moving from ")) {
894 match = message + strlen("checkout: moving from ");
895 target = strstr(match, " to ");
898 if (!match || !target)
901 len = target - match;
902 nth = cb->cnt++ % cb->alloc;
903 strbuf_reset(&cb->buf[nth]);
904 strbuf_add(&cb->buf[nth], match, len);
909 * Parse @{-N} syntax, return the number of characters parsed
910 * if successful; otherwise signal an error with negative value.
912 static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf)
916 struct grab_nth_branch_switch_cbdata cb;
920 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
922 brace = strchr(name, '}');
925 nth = strtol(name+3, &num_end, 10);
926 if (num_end != brace)
931 cb.buf = xmalloc(nth * sizeof(struct strbuf));
932 for (i = 0; i < nth; i++)
933 strbuf_init(&cb.buf[i], 20);
936 for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch, 40960, &cb);
939 for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb);
945 strbuf_add(buf, cb.buf[i].buf, cb.buf[i].len);
946 retval = brace-name+1;
949 for (i = 0; i < nth; i++)
950 strbuf_release(&cb.buf[i]);
956 int get_sha1_mb(const char *name, unsigned char *sha1)
958 struct commit *one, *two;
959 struct commit_list *mbs;
960 unsigned char sha1_tmp[20];
964 dots = strstr(name, "...");
966 return get_sha1(name, sha1);
968 st = get_sha1("HEAD", sha1_tmp);
971 strbuf_init(&sb, dots - name);
972 strbuf_add(&sb, name, dots - name);
973 st = get_sha1_committish(sb.buf, sha1_tmp);
978 one = lookup_commit_reference_gently(sha1_tmp, 0);
982 if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", sha1_tmp))
984 two = lookup_commit_reference_gently(sha1_tmp, 0);
987 mbs = get_merge_bases(one, two, 1);
988 if (!mbs || mbs->next)
992 hashcpy(sha1, mbs->item->object.sha1);
994 free_commit_list(mbs);
999 * This reads short-hand syntax that not only evaluates to a commit
1000 * object name, but also can act as if the end user spelled the name
1001 * of the branch from the command line.
1003 * - "@{-N}" finds the name of the Nth previous branch we were on, and
1004 * places the name of the branch in the given buf and returns the
1005 * number of characters parsed if successful.
1007 * - "<branch>@{upstream}" finds the name of the other ref that
1008 * <branch> is configured to merge with (missing <branch> defaults
1009 * to the current branch), and places the name of the branch in the
1010 * given buf and returns the number of characters parsed if
1013 * If the input is not of the accepted format, it returns a negative
1014 * number to signal an error.
1016 * If the input was ok but there are not N branch switches in the
1017 * reflog, it returns 0.
1019 int interpret_branch_name(const char *name, struct strbuf *buf)
1022 struct branch *upstream;
1023 int namelen = strlen(name);
1024 int len = interpret_nth_prior_checkout(name, buf);
1028 return len; /* syntax Ok, not enough switches */
1029 if (0 < len && len == namelen)
1030 return len; /* consumed all */
1032 /* we have extra data, which might need further processing */
1033 struct strbuf tmp = STRBUF_INIT;
1034 int used = buf->len;
1037 strbuf_add(buf, name + len, namelen - len);
1038 ret = interpret_branch_name(buf->buf, &tmp);
1039 /* that data was not interpreted, remove our cruft */
1041 strbuf_setlen(buf, used);
1045 strbuf_addbuf(buf, &tmp);
1046 strbuf_release(&tmp);
1047 /* tweak for size of {-N} versus expanded ref name */
1048 return ret - used + len;
1051 cp = strchr(name, '@');
1054 tmp_len = upstream_mark(cp, namelen - (cp - name));
1057 len = cp + tmp_len - name;
1058 cp = xstrndup(name, cp - name);
1059 upstream = branch_get(*cp ? cp : NULL);
1061 * Upstream can be NULL only if cp refers to HEAD and HEAD
1062 * points to something different than a branch.
1065 return error(_("HEAD does not point to a branch"));
1066 if (!upstream->merge || !upstream->merge[0]->dst) {
1067 if (!ref_exists(upstream->refname))
1068 return error(_("No such branch: '%s'"), cp);
1069 if (!upstream->merge)
1070 return error(_("No upstream configured for branch '%s'"),
1073 _("Upstream branch '%s' not stored as a remote-tracking branch"),
1074 upstream->merge[0]->src);
1077 cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0);
1079 strbuf_addstr(buf, cp);
1084 int strbuf_branchname(struct strbuf *sb, const char *name)
1086 int len = strlen(name);
1087 if (interpret_branch_name(name, sb) == len)
1089 strbuf_add(sb, name, len);
1093 int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1095 strbuf_branchname(sb, name);
1098 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
1099 return check_refname_format(sb->buf, 0);
1103 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1104 * notably "xyz^" for "parent of xyz"
1106 int get_sha1(const char *name, unsigned char *sha1)
1108 struct object_context unused;
1109 return get_sha1_with_context(name, 0, sha1, &unused);
1113 * Many callers know that the user meant to name a committish by
1114 * syntactical positions where the object name appears. Calling this
1115 * function allows the machinery to disambiguate shorter-than-unique
1116 * abbreviated object names between committish and others.
1118 * Note that this does NOT error out when the named object is not a
1119 * committish. It is merely to give a hint to the disambiguation
1122 int get_sha1_committish(const char *name, unsigned char *sha1)
1124 struct object_context unused;
1125 return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
1129 int get_sha1_treeish(const char *name, unsigned char *sha1)
1131 struct object_context unused;
1132 return get_sha1_with_context(name, GET_SHA1_TREEISH,
1136 int get_sha1_commit(const char *name, unsigned char *sha1)
1138 struct object_context unused;
1139 return get_sha1_with_context(name, GET_SHA1_COMMIT,
1143 int get_sha1_tree(const char *name, unsigned char *sha1)
1145 struct object_context unused;
1146 return get_sha1_with_context(name, GET_SHA1_TREE,
1150 int get_sha1_blob(const char *name, unsigned char *sha1)
1152 struct object_context unused;
1153 return get_sha1_with_context(name, GET_SHA1_BLOB,
1157 /* Must be called only when object_name:filename doesn't exist. */
1158 static void diagnose_invalid_sha1_path(const char *prefix,
1159 const char *filename,
1160 const unsigned char *tree_sha1,
1161 const char *object_name)
1164 unsigned char sha1[20];
1170 if (!lstat(filename, &st))
1171 die("Path '%s' exists on disk, but not in '%s'.",
1172 filename, object_name);
1173 if (errno == ENOENT || errno == ENOTDIR) {
1174 char *fullname = xmalloc(strlen(filename)
1175 + strlen(prefix) + 1);
1176 strcpy(fullname, prefix);
1177 strcat(fullname, filename);
1179 if (!get_tree_entry(tree_sha1, fullname,
1181 die("Path '%s' exists, but not '%s'.\n"
1182 "Did you mean '%s:%s' aka '%s:./%s'?",
1190 die("Path '%s' does not exist in '%s'",
1191 filename, object_name);
1195 /* Must be called only when :stage:filename doesn't exist. */
1196 static void diagnose_invalid_index_path(int stage,
1198 const char *filename)
1201 struct cache_entry *ce;
1203 unsigned namelen = strlen(filename);
1204 unsigned fullnamelen;
1210 /* Wrong stage number? */
1211 pos = cache_name_pos(filename, namelen);
1214 if (pos < active_nr) {
1215 ce = active_cache[pos];
1216 if (ce_namelen(ce) == namelen &&
1217 !memcmp(ce->name, filename, namelen))
1218 die("Path '%s' is in the index, but not at stage %d.\n"
1219 "Did you mean ':%d:%s'?",
1221 ce_stage(ce), filename);
1224 /* Confusion between relative and absolute filenames? */
1225 fullnamelen = namelen + strlen(prefix);
1226 fullname = xmalloc(fullnamelen + 1);
1227 strcpy(fullname, prefix);
1228 strcat(fullname, filename);
1229 pos = cache_name_pos(fullname, fullnamelen);
1232 if (pos < active_nr) {
1233 ce = active_cache[pos];
1234 if (ce_namelen(ce) == fullnamelen &&
1235 !memcmp(ce->name, fullname, fullnamelen))
1236 die("Path '%s' is in the index, but not '%s'.\n"
1237 "Did you mean ':%d:%s' aka ':%d:./%s'?",
1239 ce_stage(ce), fullname,
1240 ce_stage(ce), filename);
1243 if (!lstat(filename, &st))
1244 die("Path '%s' exists on disk, but not in the index.", filename);
1245 if (errno == ENOENT || errno == ENOTDIR)
1246 die("Path '%s' does not exist (neither on disk nor in the index).",
1253 static char *resolve_relative_path(const char *rel)
1255 if (prefixcmp(rel, "./") && prefixcmp(rel, "../"))
1259 die("BUG: startup_info struct is not initialized.");
1261 if (!is_inside_work_tree())
1262 die("relative path syntax can't be used outside working tree.");
1264 /* die() inside prefix_path() if resolved path is outside worktree */
1265 return prefix_path(startup_info->prefix,
1266 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1270 static int get_sha1_with_context_1(const char *name,
1273 unsigned char *sha1,
1274 struct object_context *oc)
1276 int ret, bracket_depth;
1277 int namelen = strlen(name);
1279 int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
1281 memset(oc, 0, sizeof(*oc));
1282 oc->mode = S_IFINVALID;
1283 ret = get_sha1_1(name, namelen, sha1, flags);
1287 * sha1:path --> object name of path in ent sha1
1288 * :path -> object name of absolute path in index
1289 * :./path -> object name of path relative to cwd in index
1290 * :[0-3]:path -> object name of path in index at stage
1291 * :/foo -> recent commit matching foo
1293 if (name[0] == ':') {
1295 struct cache_entry *ce;
1296 char *new_path = NULL;
1298 if (!only_to_die && namelen > 2 && name[1] == '/') {
1299 struct commit_list *list = NULL;
1300 for_each_ref(handle_one_ref, &list);
1301 return get_sha1_oneline(name + 2, sha1, list);
1305 name[1] < '0' || '3' < name[1])
1308 stage = name[1] - '0';
1311 new_path = resolve_relative_path(cp);
1313 namelen = namelen - (cp - name);
1316 namelen = strlen(cp);
1319 strncpy(oc->path, cp,
1321 oc->path[sizeof(oc->path)-1] = '\0';
1325 pos = cache_name_pos(cp, namelen);
1328 while (pos < active_nr) {
1329 ce = active_cache[pos];
1330 if (ce_namelen(ce) != namelen ||
1331 memcmp(ce->name, cp, namelen))
1333 if (ce_stage(ce) == stage) {
1334 hashcpy(sha1, ce->sha1);
1335 oc->mode = ce->ce_mode;
1341 if (only_to_die && name[1] && name[1] != '/')
1342 diagnose_invalid_index_path(stage, prefix, cp);
1346 for (cp = name, bracket_depth = 0; *cp; cp++) {
1349 else if (bracket_depth && *cp == '}')
1351 else if (!bracket_depth && *cp == ':')
1355 unsigned char tree_sha1[20];
1356 char *object_name = NULL;
1358 object_name = xmalloc(cp-name+1);
1359 strncpy(object_name, name, cp-name);
1360 object_name[cp-name] = '\0';
1362 if (!get_sha1_1(name, cp-name, tree_sha1, GET_SHA1_TREEISH)) {
1363 const char *filename = cp+1;
1364 char *new_filename = NULL;
1366 new_filename = resolve_relative_path(filename);
1368 filename = new_filename;
1369 ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
1370 if (ret && only_to_die) {
1371 diagnose_invalid_sha1_path(prefix, filename,
1372 tree_sha1, object_name);
1375 hashcpy(oc->tree, tree_sha1);
1376 strncpy(oc->path, filename,
1378 oc->path[sizeof(oc->path)-1] = '\0';
1384 die("Invalid object name '%s'.", object_name);
1391 * Call this function when you know "name" given by the end user must
1392 * name an object but it doesn't; the function _may_ die with a better
1393 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1394 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1395 * you have a chance to diagnose the error further.
1397 void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
1399 struct object_context oc;
1400 unsigned char sha1[20];
1401 get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
1404 int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
1406 return get_sha1_with_context_1(str, flags, NULL, sha1, orc);