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
));
331 if (HAS_MULTI_BITS(flags
& GET_SHA1_DISAMBIGUATORS
))
332 die("BUG: multiple get_short_sha1 disambiguator flags");
334 if (flags
& GET_SHA1_COMMIT
)
335 ds
.fn
= disambiguate_commit_only
;
336 else if (flags
& GET_SHA1_COMMITTISH
)
337 ds
.fn
= disambiguate_committish_only
;
338 else if (flags
& GET_SHA1_TREE
)
339 ds
.fn
= disambiguate_tree_only
;
340 else if (flags
& GET_SHA1_TREEISH
)
341 ds
.fn
= disambiguate_treeish_only
;
342 else if (flags
& GET_SHA1_BLOB
)
343 ds
.fn
= disambiguate_blob_only
;
345 find_short_object_filename(len
, hex_pfx
, &ds
);
346 find_short_packed_object(len
, bin_pfx
, &ds
);
347 status
= finish_object_disambiguation(&ds
, sha1
);
349 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
))
350 return error("short SHA1 %.*s is ambiguous.", len
, hex_pfx
);
354 int for_each_abbrev(const char *prefix
, each_abbrev_fn fn
, void *cb_data
)
357 unsigned char bin_pfx
[20];
358 struct disambiguate_state ds
;
359 int len
= strlen(prefix
);
361 if (len
< MINIMUM_ABBREV
|| len
> 40)
363 if (prepare_prefixes(prefix
, len
, bin_pfx
, hex_pfx
) < 0)
368 memset(&ds
, 0, sizeof(ds
));
369 ds
.always_call_fn
= 1;
370 ds
.cb_data
= cb_data
;
373 find_short_object_filename(len
, hex_pfx
, &ds
);
374 find_short_packed_object(len
, bin_pfx
, &ds
);
378 int find_unique_abbrev_r(char *hex
, const unsigned char *sha1
, int len
)
382 sha1_to_hex_r(hex
, sha1
);
383 if (len
== 40 || !len
)
385 exists
= has_sha1_file(sha1
);
387 unsigned char sha1_ret
[20];
388 status
= get_short_sha1(hex
, len
, sha1_ret
, GET_SHA1_QUIETLY
);
391 : status
== SHORT_NAME_NOT_FOUND
) {
400 const char *find_unique_abbrev(const unsigned char *sha1
, int len
)
402 static char hex
[GIT_SHA1_HEXSZ
+ 1];
403 find_unique_abbrev_r(hex
, sha1
, len
);
407 static int ambiguous_path(const char *path
, int len
)
412 for (cnt
= 0; cnt
< len
; cnt
++) {
432 static inline int at_mark(const char *string
, int len
,
433 const char **suffix
, int nr
)
437 for (i
= 0; i
< nr
; i
++) {
438 int suffix_len
= strlen(suffix
[i
]);
439 if (suffix_len
<= len
440 && !memcmp(string
, suffix
[i
], suffix_len
))
446 static inline int upstream_mark(const char *string
, int len
)
448 const char *suffix
[] = { "@{upstream}", "@{u}" };
449 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
452 static inline int push_mark(const char *string
, int len
)
454 const char *suffix
[] = { "@{push}" };
455 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
458 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
, unsigned lookup_flags
);
459 static int interpret_nth_prior_checkout(const char *name
, int namelen
, struct strbuf
*buf
);
461 static int get_sha1_basic(const char *str
, int len
, unsigned char *sha1
,
464 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
465 static const char *object_name_msg
= N_(
466 "Git normally never creates a ref that ends with 40 hex characters\n"
467 "because it will be ignored when you just specify 40-hex. These refs\n"
468 "may be created by mistake. For example,\n"
470 " git checkout -b $br $(git rev-parse ...)\n"
472 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
473 "examine these refs and maybe delete them. Turn this message off by\n"
474 "running \"git config advice.objectNameWarning false\"");
475 unsigned char tmp_sha1
[20];
476 char *real_ref
= NULL
;
478 int at
, reflog_len
, nth_prior
= 0;
480 if (len
== 40 && !get_sha1_hex(str
, sha1
)) {
481 if (warn_ambiguous_refs
&& warn_on_object_refname_ambiguity
) {
482 refs_found
= dwim_ref(str
, len
, tmp_sha1
, &real_ref
);
483 if (refs_found
> 0) {
484 warning(warn_msg
, len
, str
);
485 if (advice_object_name_warning
)
486 fprintf(stderr
, "%s\n", _(object_name_msg
));
493 /* basic@{time or number or -number} format to query ref-log */
495 if (len
&& str
[len
-1] == '}') {
496 for (at
= len
-4; at
>= 0; at
--) {
497 if (str
[at
] == '@' && str
[at
+1] == '{') {
498 if (str
[at
+2] == '-') {
500 /* @{-N} not at start */
505 if (!upstream_mark(str
+ at
, len
- at
) &&
506 !push_mark(str
+ at
, len
- at
)) {
507 reflog_len
= (len
-1) - (at
+2);
515 /* Accept only unambiguous ref paths. */
516 if (len
&& ambiguous_path(str
, len
))
520 struct strbuf buf
= STRBUF_INIT
;
523 if (interpret_nth_prior_checkout(str
, len
, &buf
) > 0) {
524 detached
= (buf
.len
== 40 && !get_sha1_hex(buf
.buf
, sha1
));
525 strbuf_release(&buf
);
531 if (!len
&& reflog_len
)
532 /* allow "@{...}" to mean the current branch reflog */
533 refs_found
= dwim_ref("HEAD", 4, sha1
, &real_ref
);
535 refs_found
= dwim_log(str
, len
, sha1
, &real_ref
);
537 refs_found
= dwim_ref(str
, len
, sha1
, &real_ref
);
542 if (warn_ambiguous_refs
&& !(flags
& GET_SHA1_QUIETLY
) &&
544 !get_short_sha1(str
, len
, tmp_sha1
, GET_SHA1_QUIETLY
)))
545 warning(warn_msg
, len
, str
);
549 unsigned long at_time
;
550 unsigned long co_time
;
553 /* Is it asking for N-th entry, or approxidate? */
554 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
555 char ch
= str
[at
+2+i
];
556 if ('0' <= ch
&& ch
<= '9')
557 nth
= nth
* 10 + ch
- '0';
561 if (100000000 <= nth
) {
568 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
569 at_time
= approxidate_careful(tmp
, &errors
);
576 if (read_ref_at(real_ref
, flags
, at_time
, nth
, sha1
, NULL
,
577 &co_time
, &co_tz
, &co_cnt
)) {
579 if (starts_with(real_ref
, "refs/heads/")) {
581 len
= strlen(real_ref
+ 11);
589 if (!(flags
& GET_SHA1_QUIETLY
)) {
590 warning("Log for '%.*s' only goes "
591 "back to %s.", len
, str
,
592 show_date(co_time
, co_tz
, DATE_MODE(RFC2822
)));
595 if (flags
& GET_SHA1_QUIETLY
) {
598 die("Log for '%.*s' only has %d entries.",
608 static int get_parent(const char *name
, int len
,
609 unsigned char *result
, int idx
)
611 unsigned char sha1
[20];
612 int ret
= get_sha1_1(name
, len
, sha1
, GET_SHA1_COMMITTISH
);
613 struct commit
*commit
;
614 struct commit_list
*p
;
618 commit
= lookup_commit_reference(sha1
);
619 if (parse_commit(commit
))
622 hashcpy(result
, commit
->object
.oid
.hash
);
628 hashcpy(result
, p
->item
->object
.oid
.hash
);
636 static int get_nth_ancestor(const char *name
, int len
,
637 unsigned char *result
, int generation
)
639 unsigned char sha1
[20];
640 struct commit
*commit
;
643 ret
= get_sha1_1(name
, len
, sha1
, GET_SHA1_COMMITTISH
);
646 commit
= lookup_commit_reference(sha1
);
650 while (generation
--) {
651 if (parse_commit(commit
) || !commit
->parents
)
653 commit
= commit
->parents
->item
;
655 hashcpy(result
, commit
->object
.oid
.hash
);
659 struct object
*peel_to_type(const char *name
, int namelen
,
660 struct object
*o
, enum object_type expected_type
)
662 if (name
&& !namelen
)
663 namelen
= strlen(name
);
665 if (!o
|| (!o
->parsed
&& !parse_object(o
->oid
.hash
)))
667 if (expected_type
== OBJ_ANY
|| o
->type
== expected_type
)
669 if (o
->type
== OBJ_TAG
)
670 o
= ((struct tag
*) o
)->tagged
;
671 else if (o
->type
== OBJ_COMMIT
)
672 o
= &(((struct commit
*) o
)->tree
->object
);
675 error("%.*s: expected %s type, but the object "
676 "dereferences to %s type",
677 namelen
, name
, typename(expected_type
),
684 static int peel_onion(const char *name
, int len
, unsigned char *sha1
)
686 unsigned char outer
[20];
688 unsigned int expected_type
= 0;
689 unsigned lookup_flags
= 0;
693 * "ref^{type}" dereferences ref repeatedly until you cannot
694 * dereference anymore, or you get an object of given type,
695 * whichever comes first. "ref^{}" means just dereference
696 * tags until you get a non-tag. "ref^0" is a shorthand for
697 * "ref^{commit}". "commit^{tree}" could be used to find the
698 * top-level tree of the given commit.
700 if (len
< 4 || name
[len
-1] != '}')
703 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
705 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
711 sp
++; /* beginning of type name, or closing brace for empty */
712 if (starts_with(sp
, "commit}"))
713 expected_type
= OBJ_COMMIT
;
714 else if (starts_with(sp
, "tag}"))
715 expected_type
= OBJ_TAG
;
716 else if (starts_with(sp
, "tree}"))
717 expected_type
= OBJ_TREE
;
718 else if (starts_with(sp
, "blob}"))
719 expected_type
= OBJ_BLOB
;
720 else if (starts_with(sp
, "object}"))
721 expected_type
= OBJ_ANY
;
722 else if (sp
[0] == '}')
723 expected_type
= OBJ_NONE
;
724 else if (sp
[0] == '/')
725 expected_type
= OBJ_COMMIT
;
729 if (expected_type
== OBJ_COMMIT
)
730 lookup_flags
= GET_SHA1_COMMITTISH
;
731 else if (expected_type
== OBJ_TREE
)
732 lookup_flags
= GET_SHA1_TREEISH
;
734 if (get_sha1_1(name
, sp
- name
- 2, outer
, lookup_flags
))
737 o
= parse_object(outer
);
740 if (!expected_type
) {
741 o
= deref_tag(o
, name
, sp
- name
- 2);
742 if (!o
|| (!o
->parsed
&& !parse_object(o
->oid
.hash
)))
744 hashcpy(sha1
, o
->oid
.hash
);
749 * At this point, the syntax look correct, so
750 * if we do not get the needed object, we should
753 o
= peel_to_type(name
, len
, o
, expected_type
);
757 hashcpy(sha1
, o
->oid
.hash
);
759 /* "$commit^{/foo}" */
762 struct commit_list
*list
= NULL
;
765 * $commit^{/}. Some regex implementation may reject.
766 * We don't need regex anyway. '' pattern always matches.
771 prefix
= xstrndup(sp
+ 1, name
+ len
- 1 - (sp
+ 1));
772 commit_list_insert((struct commit
*)o
, &list
);
773 ret
= get_sha1_oneline(prefix
, sha1
, list
);
780 static int get_describe_name(const char *name
, int len
, unsigned char *sha1
)
783 unsigned flags
= GET_SHA1_QUIETLY
| GET_SHA1_COMMIT
;
785 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
788 /* We must be looking at g in "SOMETHING-g"
789 * for it to be describe output.
791 if (ch
== 'g' && cp
[-1] == '-') {
794 return get_short_sha1(cp
, len
, sha1
, flags
);
801 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
, unsigned lookup_flags
)
807 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
810 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
812 if ('0' <= ch
&& ch
<= '9')
814 if (ch
== '~' || ch
== '^')
821 int len1
= cp
- name
;
823 while (cp
< name
+ len
)
824 num
= num
* 10 + *cp
++ - '0';
825 if (!num
&& len1
== len
- 1)
827 if (has_suffix
== '^')
828 return get_parent(name
, len1
, sha1
, num
);
829 /* else if (has_suffix == '~') -- goes without saying */
830 return get_nth_ancestor(name
, len1
, sha1
, num
);
833 ret
= peel_onion(name
, len
, sha1
);
837 ret
= get_sha1_basic(name
, len
, sha1
, lookup_flags
);
841 /* It could be describe output that is "SOMETHING-gXXXX" */
842 ret
= get_describe_name(name
, len
, sha1
);
846 return get_short_sha1(name
, len
, sha1
, lookup_flags
);
850 * This interprets names like ':/Initial revision of "git"' by searching
851 * through history and returning the first commit whose message starts
852 * the given regular expression.
854 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
856 * For a literal '!' character at the beginning of a pattern, you have to repeat
857 * that, like: ':/!!foo'
859 * For future extension, all other sequences beginning with ':/!' are reserved.
862 /* Remember to update object flag allocation in object.h */
863 #define ONELINE_SEEN (1u<<20)
865 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
866 int flag
, void *cb_data
)
868 struct commit_list
**list
= cb_data
;
869 struct object
*object
= parse_object(oid
->hash
);
872 if (object
->type
== OBJ_TAG
) {
873 object
= deref_tag(object
, path
, strlen(path
));
877 if (object
->type
!= OBJ_COMMIT
)
879 commit_list_insert((struct commit
*)object
, list
);
883 static int get_sha1_oneline(const char *prefix
, unsigned char *sha1
,
884 struct commit_list
*list
)
886 struct commit_list
*backup
= NULL
, *l
;
891 if (prefix
[0] == '!') {
894 if (prefix
[0] == '-') {
897 } else if (prefix
[0] != '!') {
902 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
905 for (l
= list
; l
; l
= l
->next
) {
906 l
->item
->object
.flags
|= ONELINE_SEEN
;
907 commit_list_insert(l
->item
, &backup
);
911 struct commit
*commit
;
914 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
915 if (!parse_object(commit
->object
.oid
.hash
))
917 buf
= get_commit_buffer(commit
, NULL
);
918 p
= strstr(buf
, "\n\n");
919 matches
= negative
^ (p
&& !regexec(®ex
, p
+ 2, 0, NULL
, 0));
920 unuse_commit_buffer(commit
, buf
);
923 hashcpy(sha1
, commit
->object
.oid
.hash
);
929 free_commit_list(list
);
930 for (l
= backup
; l
; l
= l
->next
)
931 clear_commit_marks(l
->item
, ONELINE_SEEN
);
932 free_commit_list(backup
);
933 return found
? 0 : -1;
936 struct grab_nth_branch_switch_cbdata
{
941 static int grab_nth_branch_switch(unsigned char *osha1
, unsigned char *nsha1
,
942 const char *email
, unsigned long timestamp
, int tz
,
943 const char *message
, void *cb_data
)
945 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
946 const char *match
= NULL
, *target
= NULL
;
949 if (skip_prefix(message
, "checkout: moving from ", &match
))
950 target
= strstr(match
, " to ");
952 if (!match
|| !target
)
954 if (--(cb
->remaining
) == 0) {
955 len
= target
- match
;
956 strbuf_reset(&cb
->buf
);
957 strbuf_add(&cb
->buf
, match
, len
);
958 return 1; /* we are done */
964 * Parse @{-N} syntax, return the number of characters parsed
965 * if successful; otherwise signal an error with negative value.
967 static int interpret_nth_prior_checkout(const char *name
, int namelen
,
972 struct grab_nth_branch_switch_cbdata cb
;
978 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
980 brace
= memchr(name
, '}', namelen
);
983 nth
= strtol(name
+ 3, &num_end
, 10);
984 if (num_end
!= brace
)
989 strbuf_init(&cb
.buf
, 20);
992 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch
, &cb
)) {
994 strbuf_addbuf(buf
, &cb
.buf
);
995 retval
= brace
- name
+ 1;
998 strbuf_release(&cb
.buf
);
1002 int get_oid_mb(const char *name
, struct object_id
*oid
)
1004 struct commit
*one
, *two
;
1005 struct commit_list
*mbs
;
1006 struct object_id oid_tmp
;
1010 dots
= strstr(name
, "...");
1012 return get_oid(name
, oid
);
1014 st
= get_oid("HEAD", &oid_tmp
);
1017 strbuf_init(&sb
, dots
- name
);
1018 strbuf_add(&sb
, name
, dots
- name
);
1019 st
= get_sha1_committish(sb
.buf
, oid_tmp
.hash
);
1020 strbuf_release(&sb
);
1024 one
= lookup_commit_reference_gently(oid_tmp
.hash
, 0);
1028 if (get_sha1_committish(dots
[3] ? (dots
+ 3) : "HEAD", oid_tmp
.hash
))
1030 two
= lookup_commit_reference_gently(oid_tmp
.hash
, 0);
1033 mbs
= get_merge_bases(one
, two
);
1034 if (!mbs
|| mbs
->next
)
1038 oidcpy(oid
, &mbs
->item
->object
.oid
);
1040 free_commit_list(mbs
);
1044 /* parse @something syntax, when 'something' is not {.*} */
1045 static int interpret_empty_at(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1049 if (len
|| name
[1] == '{')
1052 /* make sure it's a single @, or @@{.*}, not @foo */
1053 next
= memchr(name
+ len
+ 1, '@', namelen
- len
- 1);
1054 if (next
&& next
[1] != '{')
1057 next
= name
+ namelen
;
1058 if (next
!= name
+ 1)
1062 strbuf_add(buf
, "HEAD", 4);
1066 static int reinterpret(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1068 /* we have extra data, which might need further processing */
1069 struct strbuf tmp
= STRBUF_INIT
;
1070 int used
= buf
->len
;
1073 strbuf_add(buf
, name
+ len
, namelen
- len
);
1074 ret
= interpret_branch_name(buf
->buf
, buf
->len
, &tmp
);
1075 /* that data was not interpreted, remove our cruft */
1077 strbuf_setlen(buf
, used
);
1081 strbuf_addbuf(buf
, &tmp
);
1082 strbuf_release(&tmp
);
1083 /* tweak for size of {-N} versus expanded ref name */
1084 return ret
- used
+ len
;
1087 static void set_shortened_ref(struct strbuf
*buf
, const char *ref
)
1089 char *s
= shorten_unambiguous_ref(ref
, 0);
1091 strbuf_addstr(buf
, s
);
1095 static int interpret_branch_mark(const char *name
, int namelen
,
1096 int at
, struct strbuf
*buf
,
1097 int (*get_mark
)(const char *, int),
1098 const char *(*get_data
)(struct branch
*,
1102 struct branch
*branch
;
1103 struct strbuf err
= STRBUF_INIT
;
1106 len
= get_mark(name
+ at
, namelen
- at
);
1110 if (memchr(name
, ':', at
))
1114 char *name_str
= xmemdupz(name
, at
);
1115 branch
= branch_get(name_str
);
1118 branch
= branch_get(NULL
);
1120 value
= get_data(branch
, &err
);
1124 set_shortened_ref(buf
, value
);
1129 * This reads short-hand syntax that not only evaluates to a commit
1130 * object name, but also can act as if the end user spelled the name
1131 * of the branch from the command line.
1133 * - "@{-N}" finds the name of the Nth previous branch we were on, and
1134 * places the name of the branch in the given buf and returns the
1135 * number of characters parsed if successful.
1137 * - "<branch>@{upstream}" finds the name of the other ref that
1138 * <branch> is configured to merge with (missing <branch> defaults
1139 * to the current branch), and places the name of the branch in the
1140 * given buf and returns the number of characters parsed if
1143 * If the input is not of the accepted format, it returns a negative
1144 * number to signal an error.
1146 * If the input was ok but there are not N branch switches in the
1147 * reflog, it returns 0.
1149 int interpret_branch_name(const char *name
, int namelen
, struct strbuf
*buf
)
1153 int len
= interpret_nth_prior_checkout(name
, namelen
, buf
);
1156 namelen
= strlen(name
);
1159 return len
; /* syntax Ok, not enough switches */
1160 } else if (len
> 0) {
1162 return len
; /* consumed all */
1164 return reinterpret(name
, namelen
, len
, buf
);
1168 (at
= memchr(start
, '@', namelen
- (start
- name
)));
1171 len
= interpret_empty_at(name
, namelen
, at
- name
, buf
);
1173 return reinterpret(name
, namelen
, len
, buf
);
1175 len
= interpret_branch_mark(name
, namelen
, at
- name
, buf
,
1176 upstream_mark
, branch_get_upstream
);
1180 len
= interpret_branch_mark(name
, namelen
, at
- name
, buf
,
1181 push_mark
, branch_get_push
);
1189 int strbuf_branchname(struct strbuf
*sb
, const char *name
)
1191 int len
= strlen(name
);
1192 int used
= interpret_branch_name(name
, len
, sb
);
1198 strbuf_add(sb
, name
+ used
, len
- used
);
1202 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
1204 strbuf_branchname(sb
, name
);
1207 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
1208 return check_refname_format(sb
->buf
, 0);
1212 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1213 * notably "xyz^" for "parent of xyz"
1215 int get_sha1(const char *name
, unsigned char *sha1
)
1217 struct object_context unused
;
1218 return get_sha1_with_context(name
, 0, sha1
, &unused
);
1222 * This is like "get_sha1()", but for struct object_id.
1224 int get_oid(const char *name
, struct object_id
*oid
)
1226 return get_sha1(name
, oid
->hash
);
1231 * Many callers know that the user meant to name a commit-ish by
1232 * syntactical positions where the object name appears. Calling this
1233 * function allows the machinery to disambiguate shorter-than-unique
1234 * abbreviated object names between commit-ish and others.
1236 * Note that this does NOT error out when the named object is not a
1237 * commit-ish. It is merely to give a hint to the disambiguation
1240 int get_sha1_committish(const char *name
, unsigned char *sha1
)
1242 struct object_context unused
;
1243 return get_sha1_with_context(name
, GET_SHA1_COMMITTISH
,
1247 int get_sha1_treeish(const char *name
, unsigned char *sha1
)
1249 struct object_context unused
;
1250 return get_sha1_with_context(name
, GET_SHA1_TREEISH
,
1254 int get_sha1_commit(const char *name
, unsigned char *sha1
)
1256 struct object_context unused
;
1257 return get_sha1_with_context(name
, GET_SHA1_COMMIT
,
1261 int get_sha1_tree(const char *name
, unsigned char *sha1
)
1263 struct object_context unused
;
1264 return get_sha1_with_context(name
, GET_SHA1_TREE
,
1268 int get_sha1_blob(const char *name
, unsigned char *sha1
)
1270 struct object_context unused
;
1271 return get_sha1_with_context(name
, GET_SHA1_BLOB
,
1275 /* Must be called only when object_name:filename doesn't exist. */
1276 static void diagnose_invalid_sha1_path(const char *prefix
,
1277 const char *filename
,
1278 const unsigned char *tree_sha1
,
1279 const char *object_name
,
1280 int object_name_len
)
1282 unsigned char sha1
[20];
1288 if (file_exists(filename
))
1289 die("Path '%s' exists on disk, but not in '%.*s'.",
1290 filename
, object_name_len
, object_name
);
1291 if (errno
== ENOENT
|| errno
== ENOTDIR
) {
1292 char *fullname
= xstrfmt("%s%s", prefix
, filename
);
1294 if (!get_tree_entry(tree_sha1
, fullname
,
1296 die("Path '%s' exists, but not '%s'.\n"
1297 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
1300 object_name_len
, object_name
,
1302 object_name_len
, object_name
,
1305 die("Path '%s' does not exist in '%.*s'",
1306 filename
, object_name_len
, object_name
);
1310 /* Must be called only when :stage:filename doesn't exist. */
1311 static void diagnose_invalid_index_path(int stage
,
1313 const char *filename
)
1315 const struct cache_entry
*ce
;
1317 unsigned namelen
= strlen(filename
);
1318 struct strbuf fullname
= STRBUF_INIT
;
1323 /* Wrong stage number? */
1324 pos
= cache_name_pos(filename
, namelen
);
1327 if (pos
< active_nr
) {
1328 ce
= active_cache
[pos
];
1329 if (ce_namelen(ce
) == namelen
&&
1330 !memcmp(ce
->name
, filename
, namelen
))
1331 die("Path '%s' is in the index, but not at stage %d.\n"
1332 "Did you mean ':%d:%s'?",
1334 ce_stage(ce
), filename
);
1337 /* Confusion between relative and absolute filenames? */
1338 strbuf_addstr(&fullname
, prefix
);
1339 strbuf_addstr(&fullname
, filename
);
1340 pos
= cache_name_pos(fullname
.buf
, fullname
.len
);
1343 if (pos
< active_nr
) {
1344 ce
= active_cache
[pos
];
1345 if (ce_namelen(ce
) == fullname
.len
&&
1346 !memcmp(ce
->name
, fullname
.buf
, fullname
.len
))
1347 die("Path '%s' is in the index, but not '%s'.\n"
1348 "Did you mean ':%d:%s' aka ':%d:./%s'?",
1349 fullname
.buf
, filename
,
1350 ce_stage(ce
), fullname
.buf
,
1351 ce_stage(ce
), filename
);
1354 if (file_exists(filename
))
1355 die("Path '%s' exists on disk, but not in the index.", filename
);
1356 if (errno
== ENOENT
|| errno
== ENOTDIR
)
1357 die("Path '%s' does not exist (neither on disk nor in the index).",
1360 strbuf_release(&fullname
);
1364 static char *resolve_relative_path(const char *rel
)
1366 if (!starts_with(rel
, "./") && !starts_with(rel
, "../"))
1369 if (!is_inside_work_tree())
1370 die("relative path syntax can't be used outside working tree.");
1372 /* die() inside prefix_path() if resolved path is outside worktree */
1373 return prefix_path(startup_info
->prefix
,
1374 startup_info
->prefix
? strlen(startup_info
->prefix
) : 0,
1378 static int get_sha1_with_context_1(const char *name
,
1381 unsigned char *sha1
,
1382 struct object_context
*oc
)
1384 int ret
, bracket_depth
;
1385 int namelen
= strlen(name
);
1387 int only_to_die
= flags
& GET_SHA1_ONLY_TO_DIE
;
1390 flags
|= GET_SHA1_QUIETLY
;
1392 memset(oc
, 0, sizeof(*oc
));
1393 oc
->mode
= S_IFINVALID
;
1394 ret
= get_sha1_1(name
, namelen
, sha1
, flags
);
1398 * sha1:path --> object name of path in ent sha1
1399 * :path -> object name of absolute path in index
1400 * :./path -> object name of path relative to cwd in index
1401 * :[0-3]:path -> object name of path in index at stage
1402 * :/foo -> recent commit matching foo
1404 if (name
[0] == ':') {
1406 const struct cache_entry
*ce
;
1407 char *new_path
= NULL
;
1409 if (!only_to_die
&& namelen
> 2 && name
[1] == '/') {
1410 struct commit_list
*list
= NULL
;
1412 for_each_ref(handle_one_ref
, &list
);
1413 commit_list_sort_by_date(&list
);
1414 return get_sha1_oneline(name
+ 2, sha1
, list
);
1418 name
[1] < '0' || '3' < name
[1])
1421 stage
= name
[1] - '0';
1424 new_path
= resolve_relative_path(cp
);
1426 namelen
= namelen
- (cp
- name
);
1429 namelen
= strlen(cp
);
1432 strlcpy(oc
->path
, cp
, sizeof(oc
->path
));
1436 pos
= cache_name_pos(cp
, namelen
);
1439 while (pos
< active_nr
) {
1440 ce
= active_cache
[pos
];
1441 if (ce_namelen(ce
) != namelen
||
1442 memcmp(ce
->name
, cp
, namelen
))
1444 if (ce_stage(ce
) == stage
) {
1445 hashcpy(sha1
, ce
->oid
.hash
);
1446 oc
->mode
= ce
->ce_mode
;
1452 if (only_to_die
&& name
[1] && name
[1] != '/')
1453 diagnose_invalid_index_path(stage
, prefix
, cp
);
1457 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
1460 else if (bracket_depth
&& *cp
== '}')
1462 else if (!bracket_depth
&& *cp
== ':')
1466 unsigned char tree_sha1
[20];
1467 int len
= cp
- name
;
1468 if (!get_sha1_1(name
, len
, tree_sha1
, GET_SHA1_TREEISH
)) {
1469 const char *filename
= cp
+1;
1470 char *new_filename
= NULL
;
1472 new_filename
= resolve_relative_path(filename
);
1474 filename
= new_filename
;
1475 if (flags
& GET_SHA1_FOLLOW_SYMLINKS
) {
1476 ret
= get_tree_entry_follow_symlinks(tree_sha1
,
1477 filename
, sha1
, &oc
->symlink_path
,
1480 ret
= get_tree_entry(tree_sha1
, filename
,
1482 if (ret
&& only_to_die
) {
1483 diagnose_invalid_sha1_path(prefix
,
1489 hashcpy(oc
->tree
, tree_sha1
);
1490 strlcpy(oc
->path
, filename
, sizeof(oc
->path
));
1496 die("Invalid object name '%.*s'.", len
, name
);
1503 * Call this function when you know "name" given by the end user must
1504 * name an object but it doesn't; the function _may_ die with a better
1505 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1506 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1507 * you have a chance to diagnose the error further.
1509 void maybe_die_on_misspelt_object_name(const char *name
, const char *prefix
)
1511 struct object_context oc
;
1512 unsigned char sha1
[20];
1513 get_sha1_with_context_1(name
, GET_SHA1_ONLY_TO_DIE
, prefix
, sha1
, &oc
);
1516 int get_sha1_with_context(const char *str
, unsigned flags
, unsigned char *sha1
, struct object_context
*orc
)
1518 if (flags
& GET_SHA1_FOLLOW_SYMLINKS
&& flags
& GET_SHA1_ONLY_TO_DIE
)
1519 die("BUG: incompatible flags for get_sha1_with_context");
1520 return get_sha1_with_context_1(str
, flags
, NULL
, sha1
, orc
);