11 #include "sha1-array.h"
13 #include "object-store.h"
14 #include "repository.h"
16 static int get_oid_oneline(const char *, struct object_id
*, struct commit_list
*);
18 typedef int (*disambiguate_hint_fn
)(const struct object_id
*, void *);
20 struct disambiguate_state
{
21 int len
; /* length of prefix in hex chars */
22 char hex_pfx
[GIT_MAX_HEXSZ
+ 1];
23 struct object_id bin_pfx
;
25 disambiguate_hint_fn fn
;
27 struct object_id candidate
;
28 unsigned candidate_exists
:1;
29 unsigned candidate_checked
:1;
30 unsigned candidate_ok
:1;
31 unsigned disambiguate_fn_used
:1;
33 unsigned always_call_fn
:1;
36 static void update_candidates(struct disambiguate_state
*ds
, const struct object_id
*current
)
38 if (ds
->always_call_fn
) {
39 ds
->ambiguous
= ds
->fn(current
, ds
->cb_data
) ? 1 : 0;
42 if (!ds
->candidate_exists
) {
43 /* this is the first candidate */
44 oidcpy(&ds
->candidate
, current
);
45 ds
->candidate_exists
= 1;
47 } else if (!oidcmp(&ds
->candidate
, current
)) {
48 /* the same as what we already have seen */
53 /* cannot disambiguate between ds->candidate and current */
58 if (!ds
->candidate_checked
) {
59 ds
->candidate_ok
= ds
->fn(&ds
->candidate
, ds
->cb_data
);
60 ds
->disambiguate_fn_used
= 1;
61 ds
->candidate_checked
= 1;
64 if (!ds
->candidate_ok
) {
65 /* discard the candidate; we know it does not satisfy fn */
66 oidcpy(&ds
->candidate
, current
);
67 ds
->candidate_checked
= 0;
71 /* if we reach this point, we know ds->candidate satisfies fn */
72 if (ds
->fn(current
, ds
->cb_data
)) {
74 * if both current and candidate satisfy fn, we cannot
81 /* otherwise, current can be discarded and candidate is still good */
84 static int append_loose_object(const struct object_id
*oid
, const char *path
,
87 oid_array_append(data
, oid
);
91 static int match_sha(unsigned, const unsigned char *, const unsigned char *);
93 static void find_short_object_filename(struct disambiguate_state
*ds
)
95 int subdir_nr
= ds
->bin_pfx
.hash
[0];
96 struct alternate_object_database
*alt
;
97 static struct alternate_object_database
*fakeent
;
101 * Create a "fake" alternate object database that
102 * points to our own object database, to make it
103 * easier to get a temporary working space in
104 * alt->name/alt->base while iterating over the
105 * object databases including our own.
107 fakeent
= alloc_alt_odb(get_object_directory());
109 fakeent
->next
= the_repository
->objects
->alt_odb_list
;
111 for (alt
= fakeent
; alt
&& !ds
->ambiguous
; alt
= alt
->next
) {
114 if (!alt
->loose_objects_subdir_seen
[subdir_nr
]) {
115 struct strbuf
*buf
= alt_scratch_buf(alt
);
116 for_each_file_in_obj_subdir(subdir_nr
, buf
,
119 &alt
->loose_objects_cache
);
120 alt
->loose_objects_subdir_seen
[subdir_nr
] = 1;
123 pos
= oid_array_lookup(&alt
->loose_objects_cache
, &ds
->bin_pfx
);
126 while (!ds
->ambiguous
&& pos
< alt
->loose_objects_cache
.nr
) {
127 const struct object_id
*oid
;
128 oid
= alt
->loose_objects_cache
.oid
+ pos
;
129 if (!match_sha(ds
->len
, ds
->bin_pfx
.hash
, oid
->hash
))
131 update_candidates(ds
, oid
);
137 static int match_sha(unsigned len
, const unsigned char *a
, const unsigned char *b
)
147 if ((*a
^ *b
) & 0xf0)
152 static void unique_in_pack(struct packed_git
*p
,
153 struct disambiguate_state
*ds
)
155 uint32_t num
, i
, first
= 0;
156 const struct object_id
*current
= NULL
;
158 if (open_pack_index(p
) || !p
->num_objects
)
161 num
= p
->num_objects
;
162 bsearch_pack(&ds
->bin_pfx
, p
, &first
);
165 * At this point, "first" is the location of the lowest object
166 * with an object name that could match "bin_pfx". See if we have
167 * 0, 1 or more objects that actually match(es).
169 for (i
= first
; i
< num
&& !ds
->ambiguous
; i
++) {
170 struct object_id oid
;
171 current
= nth_packed_object_oid(&oid
, p
, i
);
172 if (!match_sha(ds
->len
, ds
->bin_pfx
.hash
, current
->hash
))
174 update_candidates(ds
, current
);
178 static void find_short_packed_object(struct disambiguate_state
*ds
)
180 struct packed_git
*p
;
182 prepare_packed_git();
183 for (p
= get_packed_git(the_repository
); p
&& !ds
->ambiguous
;
185 unique_in_pack(p
, ds
);
188 #define SHORT_NAME_NOT_FOUND (-1)
189 #define SHORT_NAME_AMBIGUOUS (-2)
191 static int finish_object_disambiguation(struct disambiguate_state
*ds
,
192 struct object_id
*oid
)
195 return SHORT_NAME_AMBIGUOUS
;
197 if (!ds
->candidate_exists
)
198 return SHORT_NAME_NOT_FOUND
;
200 if (!ds
->candidate_checked
)
202 * If this is the only candidate, there is no point
203 * calling the disambiguation hint callback.
205 * On the other hand, if the current candidate
206 * replaced an earlier candidate that did _not_ pass
207 * the disambiguation hint callback, then we do have
208 * more than one objects that match the short name
209 * given, so we should make sure this one matches;
210 * otherwise, if we discovered this one and the one
211 * that we previously discarded in the reverse order,
212 * we would end up showing different results in the
215 ds
->candidate_ok
= (!ds
->disambiguate_fn_used
||
216 ds
->fn(&ds
->candidate
, ds
->cb_data
));
218 if (!ds
->candidate_ok
)
219 return SHORT_NAME_AMBIGUOUS
;
221 oidcpy(oid
, &ds
->candidate
);
225 static int disambiguate_commit_only(const struct object_id
*oid
, void *cb_data_unused
)
227 int kind
= oid_object_info(oid
, NULL
);
228 return kind
== OBJ_COMMIT
;
231 static int disambiguate_committish_only(const struct object_id
*oid
, void *cb_data_unused
)
236 kind
= oid_object_info(oid
, NULL
);
237 if (kind
== OBJ_COMMIT
)
242 /* We need to do this the hard way... */
243 obj
= deref_tag(parse_object(oid
), NULL
, 0);
244 if (obj
&& obj
->type
== OBJ_COMMIT
)
249 static int disambiguate_tree_only(const struct object_id
*oid
, void *cb_data_unused
)
251 int kind
= oid_object_info(oid
, NULL
);
252 return kind
== OBJ_TREE
;
255 static int disambiguate_treeish_only(const struct object_id
*oid
, void *cb_data_unused
)
260 kind
= oid_object_info(oid
, NULL
);
261 if (kind
== OBJ_TREE
|| kind
== OBJ_COMMIT
)
266 /* We need to do this the hard way... */
267 obj
= deref_tag(parse_object(oid
), NULL
, 0);
268 if (obj
&& (obj
->type
== OBJ_TREE
|| obj
->type
== OBJ_COMMIT
))
273 static int disambiguate_blob_only(const struct object_id
*oid
, void *cb_data_unused
)
275 int kind
= oid_object_info(oid
, NULL
);
276 return kind
== OBJ_BLOB
;
279 static disambiguate_hint_fn default_disambiguate_hint
;
281 int set_disambiguate_hint_config(const char *var
, const char *value
)
283 static const struct {
285 disambiguate_hint_fn fn
;
288 { "commit", disambiguate_commit_only
},
289 { "committish", disambiguate_committish_only
},
290 { "tree", disambiguate_tree_only
},
291 { "treeish", disambiguate_treeish_only
},
292 { "blob", disambiguate_blob_only
}
297 return config_error_nonbool(var
);
299 for (i
= 0; i
< ARRAY_SIZE(hints
); i
++) {
300 if (!strcasecmp(value
, hints
[i
].name
)) {
301 default_disambiguate_hint
= hints
[i
].fn
;
306 return error("unknown hint type for '%s': %s", var
, value
);
309 static int init_object_disambiguation(const char *name
, int len
,
310 struct disambiguate_state
*ds
)
314 if (len
< MINIMUM_ABBREV
|| len
> GIT_SHA1_HEXSZ
)
317 memset(ds
, 0, sizeof(*ds
));
319 for (i
= 0; i
< len
;i
++) {
320 unsigned char c
= name
[i
];
322 if (c
>= '0' && c
<= '9')
324 else if (c
>= 'a' && c
<= 'f')
326 else if (c
>= 'A' && c
<='F') {
335 ds
->bin_pfx
.hash
[i
>> 1] |= val
;
339 ds
->hex_pfx
[len
] = '\0';
340 prepare_alt_odb(the_repository
);
344 static int show_ambiguous_object(const struct object_id
*oid
, void *data
)
346 const struct disambiguate_state
*ds
= data
;
347 struct strbuf desc
= STRBUF_INIT
;
351 if (ds
->fn
&& !ds
->fn(oid
, ds
->cb_data
))
354 type
= oid_object_info(oid
, NULL
);
355 if (type
== OBJ_COMMIT
) {
356 struct commit
*commit
= lookup_commit(oid
);
358 struct pretty_print_context pp
= {0};
359 pp
.date_mode
.type
= DATE_SHORT
;
360 format_commit_message(commit
, " %ad - %s", &desc
, &pp
);
362 } else if (type
== OBJ_TAG
) {
363 struct tag
*tag
= lookup_tag(oid
);
364 if (!parse_tag(tag
) && tag
->tag
)
365 strbuf_addf(&desc
, " %s", tag
->tag
);
369 find_unique_abbrev(oid
, DEFAULT_ABBREV
),
370 type_name(type
) ? type_name(type
) : "unknown type",
373 strbuf_release(&desc
);
377 static int get_short_oid(const char *name
, int len
, struct object_id
*oid
,
381 struct disambiguate_state ds
;
382 int quietly
= !!(flags
& GET_OID_QUIETLY
);
384 if (init_object_disambiguation(name
, len
, &ds
) < 0)
387 if (HAS_MULTI_BITS(flags
& GET_OID_DISAMBIGUATORS
))
388 die("BUG: multiple get_short_oid disambiguator flags");
390 if (flags
& GET_OID_COMMIT
)
391 ds
.fn
= disambiguate_commit_only
;
392 else if (flags
& GET_OID_COMMITTISH
)
393 ds
.fn
= disambiguate_committish_only
;
394 else if (flags
& GET_OID_TREE
)
395 ds
.fn
= disambiguate_tree_only
;
396 else if (flags
& GET_OID_TREEISH
)
397 ds
.fn
= disambiguate_treeish_only
;
398 else if (flags
& GET_OID_BLOB
)
399 ds
.fn
= disambiguate_blob_only
;
401 ds
.fn
= default_disambiguate_hint
;
403 find_short_object_filename(&ds
);
404 find_short_packed_object(&ds
);
405 status
= finish_object_disambiguation(&ds
, oid
);
407 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
)) {
408 error(_("short SHA1 %s is ambiguous"), ds
.hex_pfx
);
411 * We may still have ambiguity if we simply saw a series of
412 * candidates that did not satisfy our hint function. In
413 * that case, we still want to show them, so disable the hint
419 advise(_("The candidates are:"));
420 for_each_abbrev(ds
.hex_pfx
, show_ambiguous_object
, &ds
);
426 static int collect_ambiguous(const struct object_id
*oid
, void *data
)
428 oid_array_append(data
, oid
);
432 int for_each_abbrev(const char *prefix
, each_abbrev_fn fn
, void *cb_data
)
434 struct oid_array collect
= OID_ARRAY_INIT
;
435 struct disambiguate_state ds
;
438 if (init_object_disambiguation(prefix
, strlen(prefix
), &ds
) < 0)
441 ds
.always_call_fn
= 1;
442 ds
.fn
= collect_ambiguous
;
443 ds
.cb_data
= &collect
;
444 find_short_object_filename(&ds
);
445 find_short_packed_object(&ds
);
447 ret
= oid_array_for_each_unique(&collect
, fn
, cb_data
);
448 oid_array_clear(&collect
);
453 * Return the slot of the most-significant bit set in "val". There are various
454 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
455 * probably not a big deal here.
457 static unsigned msb(unsigned long val
)
465 struct min_abbrev_data
{
466 unsigned int init_len
;
467 unsigned int cur_len
;
469 const struct object_id
*oid
;
472 static inline char get_hex_char_from_oid(const struct object_id
*oid
,
475 static const char hex
[] = "0123456789abcdef";
478 return hex
[oid
->hash
[pos
>> 1] >> 4];
480 return hex
[oid
->hash
[pos
>> 1] & 0xf];
483 static int extend_abbrev_len(const struct object_id
*oid
, void *cb_data
)
485 struct min_abbrev_data
*mad
= cb_data
;
487 unsigned int i
= mad
->init_len
;
488 while (mad
->hex
[i
] && mad
->hex
[i
] == get_hex_char_from_oid(oid
, i
))
491 if (i
< GIT_MAX_RAWSZ
&& i
>= mad
->cur_len
)
492 mad
->cur_len
= i
+ 1;
497 static void find_abbrev_len_for_pack(struct packed_git
*p
,
498 struct min_abbrev_data
*mad
)
501 uint32_t num
, first
= 0;
502 struct object_id oid
;
503 const struct object_id
*mad_oid
;
505 if (open_pack_index(p
) || !p
->num_objects
)
508 num
= p
->num_objects
;
510 match
= bsearch_pack(mad_oid
, p
, &first
);
513 * first is now the position in the packfile where we would insert
514 * mad->hash if it does not exist (or the position of mad->hash if
515 * it does exist). Hence, we consider a maximum of two objects
516 * nearby for the abbreviation length.
520 if (nth_packed_object_oid(&oid
, p
, first
))
521 extend_abbrev_len(&oid
, mad
);
522 } else if (first
< num
- 1) {
523 if (nth_packed_object_oid(&oid
, p
, first
+ 1))
524 extend_abbrev_len(&oid
, mad
);
527 if (nth_packed_object_oid(&oid
, p
, first
- 1))
528 extend_abbrev_len(&oid
, mad
);
530 mad
->init_len
= mad
->cur_len
;
533 static void find_abbrev_len_packed(struct min_abbrev_data
*mad
)
535 struct packed_git
*p
;
537 prepare_packed_git();
538 for (p
= get_packed_git(the_repository
); p
; p
= p
->next
)
539 find_abbrev_len_for_pack(p
, mad
);
542 int find_unique_abbrev_r(char *hex
, const struct object_id
*oid
, int len
)
544 struct disambiguate_state ds
;
545 struct min_abbrev_data mad
;
546 struct object_id oid_ret
;
548 unsigned long count
= approximate_object_count();
550 * Add one because the MSB only tells us the highest bit set,
551 * not including the value of all the _other_ bits (so "15"
552 * is only one off of 2^4, but the MSB is the 3rd bit.
554 len
= msb(count
) + 1;
556 * We now know we have on the order of 2^len objects, which
557 * expects a collision at 2^(len/2). But we also care about hex
558 * chars, not bits, and there are 4 bits per hex. So all
559 * together we need to divide by 2 and round up.
561 len
= DIV_ROUND_UP(len
, 2);
563 * For very small repos, we stick with our regular fallback.
565 if (len
< FALLBACK_DEFAULT_ABBREV
)
566 len
= FALLBACK_DEFAULT_ABBREV
;
569 oid_to_hex_r(hex
, oid
);
570 if (len
== GIT_SHA1_HEXSZ
|| !len
)
571 return GIT_SHA1_HEXSZ
;
578 find_abbrev_len_packed(&mad
);
580 if (init_object_disambiguation(hex
, mad
.cur_len
, &ds
) < 0)
583 ds
.fn
= extend_abbrev_len
;
584 ds
.always_call_fn
= 1;
585 ds
.cb_data
= (void *)&mad
;
587 find_short_object_filename(&ds
);
588 (void)finish_object_disambiguation(&ds
, &oid_ret
);
590 hex
[mad
.cur_len
] = 0;
594 const char *find_unique_abbrev(const struct object_id
*oid
, int len
)
597 static char hexbuffer
[4][GIT_MAX_HEXSZ
+ 1];
598 char *hex
= hexbuffer
[bufno
];
599 bufno
= (bufno
+ 1) % ARRAY_SIZE(hexbuffer
);
600 find_unique_abbrev_r(hex
, oid
, len
);
604 static int ambiguous_path(const char *path
, int len
)
609 for (cnt
= 0; cnt
< len
; cnt
++) {
629 static inline int at_mark(const char *string
, int len
,
630 const char **suffix
, int nr
)
634 for (i
= 0; i
< nr
; i
++) {
635 int suffix_len
= strlen(suffix
[i
]);
636 if (suffix_len
<= len
637 && !strncasecmp(string
, suffix
[i
], suffix_len
))
643 static inline int upstream_mark(const char *string
, int len
)
645 const char *suffix
[] = { "@{upstream}", "@{u}" };
646 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
649 static inline int push_mark(const char *string
, int len
)
651 const char *suffix
[] = { "@{push}" };
652 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
655 static int get_oid_1(const char *name
, int len
, struct object_id
*oid
, unsigned lookup_flags
);
656 static int interpret_nth_prior_checkout(const char *name
, int namelen
, struct strbuf
*buf
);
658 static int get_oid_basic(const char *str
, int len
, struct object_id
*oid
,
661 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
662 static const char *object_name_msg
= N_(
663 "Git normally never creates a ref that ends with 40 hex characters\n"
664 "because it will be ignored when you just specify 40-hex. These refs\n"
665 "may be created by mistake. For example,\n"
667 " git checkout -b $br $(git rev-parse ...)\n"
669 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
670 "examine these refs and maybe delete them. Turn this message off by\n"
671 "running \"git config advice.objectNameWarning false\"");
672 struct object_id tmp_oid
;
673 char *real_ref
= NULL
;
675 int at
, reflog_len
, nth_prior
= 0;
677 if (len
== GIT_SHA1_HEXSZ
&& !get_oid_hex(str
, oid
)) {
678 if (warn_ambiguous_refs
&& warn_on_object_refname_ambiguity
) {
679 refs_found
= dwim_ref(str
, len
, &tmp_oid
, &real_ref
);
680 if (refs_found
> 0) {
681 warning(warn_msg
, len
, str
);
682 if (advice_object_name_warning
)
683 fprintf(stderr
, "%s\n", _(object_name_msg
));
690 /* basic@{time or number or -number} format to query ref-log */
692 if (len
&& str
[len
-1] == '}') {
693 for (at
= len
-4; at
>= 0; at
--) {
694 if (str
[at
] == '@' && str
[at
+1] == '{') {
695 if (str
[at
+2] == '-') {
697 /* @{-N} not at start */
702 if (!upstream_mark(str
+ at
, len
- at
) &&
703 !push_mark(str
+ at
, len
- at
)) {
704 reflog_len
= (len
-1) - (at
+2);
712 /* Accept only unambiguous ref paths. */
713 if (len
&& ambiguous_path(str
, len
))
717 struct strbuf buf
= STRBUF_INIT
;
720 if (interpret_nth_prior_checkout(str
, len
, &buf
) > 0) {
721 detached
= (buf
.len
== GIT_SHA1_HEXSZ
&& !get_oid_hex(buf
.buf
, oid
));
722 strbuf_release(&buf
);
728 if (!len
&& reflog_len
)
729 /* allow "@{...}" to mean the current branch reflog */
730 refs_found
= dwim_ref("HEAD", 4, oid
, &real_ref
);
732 refs_found
= dwim_log(str
, len
, oid
, &real_ref
);
734 refs_found
= dwim_ref(str
, len
, oid
, &real_ref
);
739 if (warn_ambiguous_refs
&& !(flags
& GET_OID_QUIETLY
) &&
741 !get_short_oid(str
, len
, &tmp_oid
, GET_OID_QUIETLY
)))
742 warning(warn_msg
, len
, str
);
750 /* Is it asking for N-th entry, or approxidate? */
751 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
752 char ch
= str
[at
+2+i
];
753 if ('0' <= ch
&& ch
<= '9')
754 nth
= nth
* 10 + ch
- '0';
758 if (100000000 <= nth
) {
765 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
766 at_time
= approxidate_careful(tmp
, &errors
);
773 if (read_ref_at(real_ref
, flags
, at_time
, nth
, oid
, NULL
,
774 &co_time
, &co_tz
, &co_cnt
)) {
776 if (starts_with(real_ref
, "refs/heads/")) {
778 len
= strlen(real_ref
+ 11);
786 if (!(flags
& GET_OID_QUIETLY
)) {
787 warning("Log for '%.*s' only goes "
788 "back to %s.", len
, str
,
789 show_date(co_time
, co_tz
, DATE_MODE(RFC2822
)));
792 if (flags
& GET_OID_QUIETLY
) {
795 die("Log for '%.*s' only has %d entries.",
805 static int get_parent(const char *name
, int len
,
806 struct object_id
*result
, int idx
)
808 struct object_id oid
;
809 int ret
= get_oid_1(name
, len
, &oid
, GET_OID_COMMITTISH
);
810 struct commit
*commit
;
811 struct commit_list
*p
;
815 commit
= lookup_commit_reference(&oid
);
816 if (parse_commit(commit
))
819 oidcpy(result
, &commit
->object
.oid
);
825 oidcpy(result
, &p
->item
->object
.oid
);
833 static int get_nth_ancestor(const char *name
, int len
,
834 struct object_id
*result
, int generation
)
836 struct object_id oid
;
837 struct commit
*commit
;
840 ret
= get_oid_1(name
, len
, &oid
, GET_OID_COMMITTISH
);
843 commit
= lookup_commit_reference(&oid
);
847 while (generation
--) {
848 if (parse_commit(commit
) || !commit
->parents
)
850 commit
= commit
->parents
->item
;
852 oidcpy(result
, &commit
->object
.oid
);
856 struct object
*peel_to_type(const char *name
, int namelen
,
857 struct object
*o
, enum object_type expected_type
)
859 if (name
&& !namelen
)
860 namelen
= strlen(name
);
862 if (!o
|| (!o
->parsed
&& !parse_object(&o
->oid
)))
864 if (expected_type
== OBJ_ANY
|| o
->type
== expected_type
)
866 if (o
->type
== OBJ_TAG
)
867 o
= ((struct tag
*) o
)->tagged
;
868 else if (o
->type
== OBJ_COMMIT
)
869 o
= &(((struct commit
*) o
)->tree
->object
);
872 error("%.*s: expected %s type, but the object "
873 "dereferences to %s type",
874 namelen
, name
, type_name(expected_type
),
881 static int peel_onion(const char *name
, int len
, struct object_id
*oid
,
882 unsigned lookup_flags
)
884 struct object_id outer
;
886 unsigned int expected_type
= 0;
890 * "ref^{type}" dereferences ref repeatedly until you cannot
891 * dereference anymore, or you get an object of given type,
892 * whichever comes first. "ref^{}" means just dereference
893 * tags until you get a non-tag. "ref^0" is a shorthand for
894 * "ref^{commit}". "commit^{tree}" could be used to find the
895 * top-level tree of the given commit.
897 if (len
< 4 || name
[len
-1] != '}')
900 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
902 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
908 sp
++; /* beginning of type name, or closing brace for empty */
909 if (starts_with(sp
, "commit}"))
910 expected_type
= OBJ_COMMIT
;
911 else if (starts_with(sp
, "tag}"))
912 expected_type
= OBJ_TAG
;
913 else if (starts_with(sp
, "tree}"))
914 expected_type
= OBJ_TREE
;
915 else if (starts_with(sp
, "blob}"))
916 expected_type
= OBJ_BLOB
;
917 else if (starts_with(sp
, "object}"))
918 expected_type
= OBJ_ANY
;
919 else if (sp
[0] == '}')
920 expected_type
= OBJ_NONE
;
921 else if (sp
[0] == '/')
922 expected_type
= OBJ_COMMIT
;
926 lookup_flags
&= ~GET_OID_DISAMBIGUATORS
;
927 if (expected_type
== OBJ_COMMIT
)
928 lookup_flags
|= GET_OID_COMMITTISH
;
929 else if (expected_type
== OBJ_TREE
)
930 lookup_flags
|= GET_OID_TREEISH
;
932 if (get_oid_1(name
, sp
- name
- 2, &outer
, lookup_flags
))
935 o
= parse_object(&outer
);
938 if (!expected_type
) {
939 o
= deref_tag(o
, name
, sp
- name
- 2);
940 if (!o
|| (!o
->parsed
&& !parse_object(&o
->oid
)))
942 oidcpy(oid
, &o
->oid
);
947 * At this point, the syntax look correct, so
948 * if we do not get the needed object, we should
951 o
= peel_to_type(name
, len
, o
, expected_type
);
955 oidcpy(oid
, &o
->oid
);
957 /* "$commit^{/foo}" */
960 struct commit_list
*list
= NULL
;
963 * $commit^{/}. Some regex implementation may reject.
964 * We don't need regex anyway. '' pattern always matches.
969 prefix
= xstrndup(sp
+ 1, name
+ len
- 1 - (sp
+ 1));
970 commit_list_insert((struct commit
*)o
, &list
);
971 ret
= get_oid_oneline(prefix
, oid
, list
);
978 static int get_describe_name(const char *name
, int len
, struct object_id
*oid
)
981 unsigned flags
= GET_OID_QUIETLY
| GET_OID_COMMIT
;
983 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
986 /* We must be looking at g in "SOMETHING-g"
987 * for it to be describe output.
989 if (ch
== 'g' && cp
[-1] == '-') {
992 return get_short_oid(cp
, len
, oid
, flags
);
999 static int get_oid_1(const char *name
, int len
, struct object_id
*oid
, unsigned lookup_flags
)
1001 int ret
, has_suffix
;
1005 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
1008 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
1010 if ('0' <= ch
&& ch
<= '9')
1012 if (ch
== '~' || ch
== '^')
1019 int len1
= cp
- name
;
1021 while (cp
< name
+ len
)
1022 num
= num
* 10 + *cp
++ - '0';
1023 if (!num
&& len1
== len
- 1)
1025 if (has_suffix
== '^')
1026 return get_parent(name
, len1
, oid
, num
);
1027 /* else if (has_suffix == '~') -- goes without saying */
1028 return get_nth_ancestor(name
, len1
, oid
, num
);
1031 ret
= peel_onion(name
, len
, oid
, lookup_flags
);
1035 ret
= get_oid_basic(name
, len
, oid
, lookup_flags
);
1039 /* It could be describe output that is "SOMETHING-gXXXX" */
1040 ret
= get_describe_name(name
, len
, oid
);
1044 return get_short_oid(name
, len
, oid
, lookup_flags
);
1048 * This interprets names like ':/Initial revision of "git"' by searching
1049 * through history and returning the first commit whose message starts
1050 * the given regular expression.
1052 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1054 * For a literal '!' character at the beginning of a pattern, you have to repeat
1055 * that, like: ':/!!foo'
1057 * For future extension, all other sequences beginning with ':/!' are reserved.
1060 /* Remember to update object flag allocation in object.h */
1061 #define ONELINE_SEEN (1u<<20)
1063 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1064 int flag
, void *cb_data
)
1066 struct commit_list
**list
= cb_data
;
1067 struct object
*object
= parse_object(oid
);
1070 if (object
->type
== OBJ_TAG
) {
1071 object
= deref_tag(object
, path
, strlen(path
));
1075 if (object
->type
!= OBJ_COMMIT
)
1077 commit_list_insert((struct commit
*)object
, list
);
1081 static int get_oid_oneline(const char *prefix
, struct object_id
*oid
,
1082 struct commit_list
*list
)
1084 struct commit_list
*backup
= NULL
, *l
;
1089 if (prefix
[0] == '!') {
1092 if (prefix
[0] == '-') {
1095 } else if (prefix
[0] != '!') {
1100 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
1103 for (l
= list
; l
; l
= l
->next
) {
1104 l
->item
->object
.flags
|= ONELINE_SEEN
;
1105 commit_list_insert(l
->item
, &backup
);
1108 const char *p
, *buf
;
1109 struct commit
*commit
;
1112 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
1113 if (!parse_object(&commit
->object
.oid
))
1115 buf
= get_commit_buffer(commit
, NULL
);
1116 p
= strstr(buf
, "\n\n");
1117 matches
= negative
^ (p
&& !regexec(®ex
, p
+ 2, 0, NULL
, 0));
1118 unuse_commit_buffer(commit
, buf
);
1121 oidcpy(oid
, &commit
->object
.oid
);
1127 free_commit_list(list
);
1128 for (l
= backup
; l
; l
= l
->next
)
1129 clear_commit_marks(l
->item
, ONELINE_SEEN
);
1130 free_commit_list(backup
);
1131 return found
? 0 : -1;
1134 struct grab_nth_branch_switch_cbdata
{
1139 static int grab_nth_branch_switch(struct object_id
*ooid
, struct object_id
*noid
,
1140 const char *email
, timestamp_t timestamp
, int tz
,
1141 const char *message
, void *cb_data
)
1143 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
1144 const char *match
= NULL
, *target
= NULL
;
1147 if (skip_prefix(message
, "checkout: moving from ", &match
))
1148 target
= strstr(match
, " to ");
1150 if (!match
|| !target
)
1152 if (--(cb
->remaining
) == 0) {
1153 len
= target
- match
;
1154 strbuf_reset(&cb
->buf
);
1155 strbuf_add(&cb
->buf
, match
, len
);
1156 return 1; /* we are done */
1162 * Parse @{-N} syntax, return the number of characters parsed
1163 * if successful; otherwise signal an error with negative value.
1165 static int interpret_nth_prior_checkout(const char *name
, int namelen
,
1170 struct grab_nth_branch_switch_cbdata cb
;
1176 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
1178 brace
= memchr(name
, '}', namelen
);
1181 nth
= strtol(name
+ 3, &num_end
, 10);
1182 if (num_end
!= brace
)
1187 strbuf_init(&cb
.buf
, 20);
1190 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch
, &cb
)) {
1192 strbuf_addbuf(buf
, &cb
.buf
);
1193 retval
= brace
- name
+ 1;
1196 strbuf_release(&cb
.buf
);
1200 int get_oid_mb(const char *name
, struct object_id
*oid
)
1202 struct commit
*one
, *two
;
1203 struct commit_list
*mbs
;
1204 struct object_id oid_tmp
;
1208 dots
= strstr(name
, "...");
1210 return get_oid(name
, oid
);
1212 st
= get_oid("HEAD", &oid_tmp
);
1215 strbuf_init(&sb
, dots
- name
);
1216 strbuf_add(&sb
, name
, dots
- name
);
1217 st
= get_oid_committish(sb
.buf
, &oid_tmp
);
1218 strbuf_release(&sb
);
1222 one
= lookup_commit_reference_gently(&oid_tmp
, 0);
1226 if (get_oid_committish(dots
[3] ? (dots
+ 3) : "HEAD", &oid_tmp
))
1228 two
= lookup_commit_reference_gently(&oid_tmp
, 0);
1231 mbs
= get_merge_bases(one
, two
);
1232 if (!mbs
|| mbs
->next
)
1236 oidcpy(oid
, &mbs
->item
->object
.oid
);
1238 free_commit_list(mbs
);
1242 /* parse @something syntax, when 'something' is not {.*} */
1243 static int interpret_empty_at(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1247 if (len
|| name
[1] == '{')
1250 /* make sure it's a single @, or @@{.*}, not @foo */
1251 next
= memchr(name
+ len
+ 1, '@', namelen
- len
- 1);
1252 if (next
&& next
[1] != '{')
1255 next
= name
+ namelen
;
1256 if (next
!= name
+ 1)
1260 strbuf_add(buf
, "HEAD", 4);
1264 static int reinterpret(const char *name
, int namelen
, int len
,
1265 struct strbuf
*buf
, unsigned allowed
)
1267 /* we have extra data, which might need further processing */
1268 struct strbuf tmp
= STRBUF_INIT
;
1269 int used
= buf
->len
;
1272 strbuf_add(buf
, name
+ len
, namelen
- len
);
1273 ret
= interpret_branch_name(buf
->buf
, buf
->len
, &tmp
, allowed
);
1274 /* that data was not interpreted, remove our cruft */
1276 strbuf_setlen(buf
, used
);
1280 strbuf_addbuf(buf
, &tmp
);
1281 strbuf_release(&tmp
);
1282 /* tweak for size of {-N} versus expanded ref name */
1283 return ret
- used
+ len
;
1286 static void set_shortened_ref(struct strbuf
*buf
, const char *ref
)
1288 char *s
= shorten_unambiguous_ref(ref
, 0);
1290 strbuf_addstr(buf
, s
);
1294 static int branch_interpret_allowed(const char *refname
, unsigned allowed
)
1299 if ((allowed
& INTERPRET_BRANCH_LOCAL
) &&
1300 starts_with(refname
, "refs/heads/"))
1302 if ((allowed
& INTERPRET_BRANCH_REMOTE
) &&
1303 starts_with(refname
, "refs/remotes/"))
1309 static int interpret_branch_mark(const char *name
, int namelen
,
1310 int at
, struct strbuf
*buf
,
1311 int (*get_mark
)(const char *, int),
1312 const char *(*get_data
)(struct branch
*,
1317 struct branch
*branch
;
1318 struct strbuf err
= STRBUF_INIT
;
1321 len
= get_mark(name
+ at
, namelen
- at
);
1325 if (memchr(name
, ':', at
))
1329 char *name_str
= xmemdupz(name
, at
);
1330 branch
= branch_get(name_str
);
1333 branch
= branch_get(NULL
);
1335 value
= get_data(branch
, &err
);
1339 if (!branch_interpret_allowed(value
, allowed
))
1342 set_shortened_ref(buf
, value
);
1346 int interpret_branch_name(const char *name
, int namelen
, struct strbuf
*buf
,
1354 namelen
= strlen(name
);
1356 if (!allowed
|| (allowed
& INTERPRET_BRANCH_LOCAL
)) {
1357 len
= interpret_nth_prior_checkout(name
, namelen
, buf
);
1359 return len
; /* syntax Ok, not enough switches */
1360 } else if (len
> 0) {
1362 return len
; /* consumed all */
1364 return reinterpret(name
, namelen
, len
, buf
, allowed
);
1369 (at
= memchr(start
, '@', namelen
- (start
- name
)));
1372 if (!allowed
|| (allowed
& INTERPRET_BRANCH_HEAD
)) {
1373 len
= interpret_empty_at(name
, namelen
, at
- name
, buf
);
1375 return reinterpret(name
, namelen
, len
, buf
,
1379 len
= interpret_branch_mark(name
, namelen
, at
- name
, buf
,
1380 upstream_mark
, branch_get_upstream
,
1385 len
= interpret_branch_mark(name
, namelen
, at
- name
, buf
,
1386 push_mark
, branch_get_push
,
1395 void strbuf_branchname(struct strbuf
*sb
, const char *name
, unsigned allowed
)
1397 int len
= strlen(name
);
1398 int used
= interpret_branch_name(name
, len
, sb
, allowed
);
1402 strbuf_add(sb
, name
+ used
, len
- used
);
1405 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
1407 if (startup_info
->have_repository
)
1408 strbuf_branchname(sb
, name
, INTERPRET_BRANCH_LOCAL
);
1410 strbuf_addstr(sb
, name
);
1413 * This splice must be done even if we end up rejecting the
1414 * name; builtin/branch.c::copy_or_rename_branch() still wants
1415 * to see what the name expanded to so that "branch -m" can be
1416 * used as a tool to correct earlier mistakes.
1418 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
1421 !strcmp(sb
->buf
, "refs/heads/HEAD"))
1424 return check_refname_format(sb
->buf
, 0);
1428 * This is like "get_oid_basic()", except it allows "object ID expressions",
1429 * notably "xyz^" for "parent of xyz"
1431 int get_oid(const char *name
, struct object_id
*oid
)
1433 struct object_context unused
;
1434 return get_oid_with_context(name
, 0, oid
, &unused
);
1439 * Many callers know that the user meant to name a commit-ish by
1440 * syntactical positions where the object name appears. Calling this
1441 * function allows the machinery to disambiguate shorter-than-unique
1442 * abbreviated object names between commit-ish and others.
1444 * Note that this does NOT error out when the named object is not a
1445 * commit-ish. It is merely to give a hint to the disambiguation
1448 int get_oid_committish(const char *name
, struct object_id
*oid
)
1450 struct object_context unused
;
1451 return get_oid_with_context(name
, GET_OID_COMMITTISH
,
1455 int get_oid_treeish(const char *name
, struct object_id
*oid
)
1457 struct object_context unused
;
1458 return get_oid_with_context(name
, GET_OID_TREEISH
,
1462 int get_oid_commit(const char *name
, struct object_id
*oid
)
1464 struct object_context unused
;
1465 return get_oid_with_context(name
, GET_OID_COMMIT
,
1469 int get_oid_tree(const char *name
, struct object_id
*oid
)
1471 struct object_context unused
;
1472 return get_oid_with_context(name
, GET_OID_TREE
,
1476 int get_oid_blob(const char *name
, struct object_id
*oid
)
1478 struct object_context unused
;
1479 return get_oid_with_context(name
, GET_OID_BLOB
,
1483 /* Must be called only when object_name:filename doesn't exist. */
1484 static void diagnose_invalid_oid_path(const char *prefix
,
1485 const char *filename
,
1486 const struct object_id
*tree_oid
,
1487 const char *object_name
,
1488 int object_name_len
)
1490 struct object_id oid
;
1496 if (file_exists(filename
))
1497 die("Path '%s' exists on disk, but not in '%.*s'.",
1498 filename
, object_name_len
, object_name
);
1499 if (is_missing_file_error(errno
)) {
1500 char *fullname
= xstrfmt("%s%s", prefix
, filename
);
1502 if (!get_tree_entry(tree_oid
, fullname
, &oid
, &mode
)) {
1503 die("Path '%s' exists, but not '%s'.\n"
1504 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
1507 object_name_len
, object_name
,
1509 object_name_len
, object_name
,
1512 die("Path '%s' does not exist in '%.*s'",
1513 filename
, object_name_len
, object_name
);
1517 /* Must be called only when :stage:filename doesn't exist. */
1518 static void diagnose_invalid_index_path(int stage
,
1520 const char *filename
)
1522 const struct cache_entry
*ce
;
1524 unsigned namelen
= strlen(filename
);
1525 struct strbuf fullname
= STRBUF_INIT
;
1530 /* Wrong stage number? */
1531 pos
= cache_name_pos(filename
, namelen
);
1534 if (pos
< active_nr
) {
1535 ce
= active_cache
[pos
];
1536 if (ce_namelen(ce
) == namelen
&&
1537 !memcmp(ce
->name
, filename
, namelen
))
1538 die("Path '%s' is in the index, but not at stage %d.\n"
1539 "Did you mean ':%d:%s'?",
1541 ce_stage(ce
), filename
);
1544 /* Confusion between relative and absolute filenames? */
1545 strbuf_addstr(&fullname
, prefix
);
1546 strbuf_addstr(&fullname
, filename
);
1547 pos
= cache_name_pos(fullname
.buf
, fullname
.len
);
1550 if (pos
< active_nr
) {
1551 ce
= active_cache
[pos
];
1552 if (ce_namelen(ce
) == fullname
.len
&&
1553 !memcmp(ce
->name
, fullname
.buf
, fullname
.len
))
1554 die("Path '%s' is in the index, but not '%s'.\n"
1555 "Did you mean ':%d:%s' aka ':%d:./%s'?",
1556 fullname
.buf
, filename
,
1557 ce_stage(ce
), fullname
.buf
,
1558 ce_stage(ce
), filename
);
1561 if (file_exists(filename
))
1562 die("Path '%s' exists on disk, but not in the index.", filename
);
1563 if (is_missing_file_error(errno
))
1564 die("Path '%s' does not exist (neither on disk nor in the index).",
1567 strbuf_release(&fullname
);
1571 static char *resolve_relative_path(const char *rel
)
1573 if (!starts_with(rel
, "./") && !starts_with(rel
, "../"))
1576 if (!is_inside_work_tree())
1577 die("relative path syntax can't be used outside working tree.");
1579 /* die() inside prefix_path() if resolved path is outside worktree */
1580 return prefix_path(startup_info
->prefix
,
1581 startup_info
->prefix
? strlen(startup_info
->prefix
) : 0,
1585 static int get_oid_with_context_1(const char *name
,
1588 struct object_id
*oid
,
1589 struct object_context
*oc
)
1591 int ret
, bracket_depth
;
1592 int namelen
= strlen(name
);
1594 int only_to_die
= flags
& GET_OID_ONLY_TO_DIE
;
1597 flags
|= GET_OID_QUIETLY
;
1599 memset(oc
, 0, sizeof(*oc
));
1600 oc
->mode
= S_IFINVALID
;
1601 strbuf_init(&oc
->symlink_path
, 0);
1602 ret
= get_oid_1(name
, namelen
, oid
, flags
);
1606 * sha1:path --> object name of path in ent sha1
1607 * :path -> object name of absolute path in index
1608 * :./path -> object name of path relative to cwd in index
1609 * :[0-3]:path -> object name of path in index at stage
1610 * :/foo -> recent commit matching foo
1612 if (name
[0] == ':') {
1614 const struct cache_entry
*ce
;
1615 char *new_path
= NULL
;
1617 if (!only_to_die
&& namelen
> 2 && name
[1] == '/') {
1618 struct commit_list
*list
= NULL
;
1620 for_each_ref(handle_one_ref
, &list
);
1621 commit_list_sort_by_date(&list
);
1622 return get_oid_oneline(name
+ 2, oid
, list
);
1626 name
[1] < '0' || '3' < name
[1])
1629 stage
= name
[1] - '0';
1632 new_path
= resolve_relative_path(cp
);
1634 namelen
= namelen
- (cp
- name
);
1637 namelen
= strlen(cp
);
1640 if (flags
& GET_OID_RECORD_PATH
)
1641 oc
->path
= xstrdup(cp
);
1645 pos
= cache_name_pos(cp
, namelen
);
1648 while (pos
< active_nr
) {
1649 ce
= active_cache
[pos
];
1650 if (ce_namelen(ce
) != namelen
||
1651 memcmp(ce
->name
, cp
, namelen
))
1653 if (ce_stage(ce
) == stage
) {
1654 oidcpy(oid
, &ce
->oid
);
1655 oc
->mode
= ce
->ce_mode
;
1661 if (only_to_die
&& name
[1] && name
[1] != '/')
1662 diagnose_invalid_index_path(stage
, prefix
, cp
);
1666 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
1669 else if (bracket_depth
&& *cp
== '}')
1671 else if (!bracket_depth
&& *cp
== ':')
1675 struct object_id tree_oid
;
1676 int len
= cp
- name
;
1677 unsigned sub_flags
= flags
;
1679 sub_flags
&= ~GET_OID_DISAMBIGUATORS
;
1680 sub_flags
|= GET_OID_TREEISH
;
1682 if (!get_oid_1(name
, len
, &tree_oid
, sub_flags
)) {
1683 const char *filename
= cp
+1;
1684 char *new_filename
= NULL
;
1686 new_filename
= resolve_relative_path(filename
);
1688 filename
= new_filename
;
1689 if (flags
& GET_OID_FOLLOW_SYMLINKS
) {
1690 ret
= get_tree_entry_follow_symlinks(tree_oid
.hash
,
1691 filename
, oid
->hash
, &oc
->symlink_path
,
1694 ret
= get_tree_entry(&tree_oid
, filename
, oid
,
1696 if (ret
&& only_to_die
) {
1697 diagnose_invalid_oid_path(prefix
,
1703 hashcpy(oc
->tree
, tree_oid
.hash
);
1704 if (flags
& GET_OID_RECORD_PATH
)
1705 oc
->path
= xstrdup(filename
);
1711 die("Invalid object name '%.*s'.", len
, name
);
1718 * Call this function when you know "name" given by the end user must
1719 * name an object but it doesn't; the function _may_ die with a better
1720 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1721 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1722 * you have a chance to diagnose the error further.
1724 void maybe_die_on_misspelt_object_name(const char *name
, const char *prefix
)
1726 struct object_context oc
;
1727 struct object_id oid
;
1728 get_oid_with_context_1(name
, GET_OID_ONLY_TO_DIE
, prefix
, &oid
, &oc
);
1731 int get_oid_with_context(const char *str
, unsigned flags
, struct object_id
*oid
, struct object_context
*oc
)
1733 if (flags
& GET_OID_FOLLOW_SYMLINKS
&& flags
& GET_OID_ONLY_TO_DIE
)
1734 die("BUG: incompatible flags for get_sha1_with_context");
1735 return get_oid_with_context_1(str
, flags
, NULL
, oid
, oc
);