3 #include "environment.h"
10 #include "tree-walk.h"
14 #include "oid-array.h"
16 #include "object-store.h"
17 #include "repository.h"
19 #include "submodule.h"
21 #include "commit-reach.h"
24 static int get_oid_oneline(struct repository
*r
, const char *, struct object_id
*, struct commit_list
*);
26 typedef int (*disambiguate_hint_fn
)(struct repository
*, const struct object_id
*, void *);
28 struct disambiguate_state
{
29 int len
; /* length of prefix in hex chars */
30 char hex_pfx
[GIT_MAX_HEXSZ
+ 1];
31 struct object_id bin_pfx
;
33 struct repository
*repo
;
34 disambiguate_hint_fn fn
;
36 struct object_id candidate
;
37 unsigned candidate_exists
:1;
38 unsigned candidate_checked
:1;
39 unsigned candidate_ok
:1;
40 unsigned disambiguate_fn_used
:1;
42 unsigned always_call_fn
:1;
45 static void update_candidates(struct disambiguate_state
*ds
, const struct object_id
*current
)
47 if (ds
->always_call_fn
) {
48 ds
->ambiguous
= ds
->fn(ds
->repo
, current
, ds
->cb_data
) ? 1 : 0;
51 if (!ds
->candidate_exists
) {
52 /* this is the first candidate */
53 oidcpy(&ds
->candidate
, current
);
54 ds
->candidate_exists
= 1;
56 } else if (oideq(&ds
->candidate
, current
)) {
57 /* the same as what we already have seen */
62 /* cannot disambiguate between ds->candidate and current */
67 if (!ds
->candidate_checked
) {
68 ds
->candidate_ok
= ds
->fn(ds
->repo
, &ds
->candidate
, ds
->cb_data
);
69 ds
->disambiguate_fn_used
= 1;
70 ds
->candidate_checked
= 1;
73 if (!ds
->candidate_ok
) {
74 /* discard the candidate; we know it does not satisfy fn */
75 oidcpy(&ds
->candidate
, current
);
76 ds
->candidate_checked
= 0;
80 /* if we reach this point, we know ds->candidate satisfies fn */
81 if (ds
->fn(ds
->repo
, current
, ds
->cb_data
)) {
83 * if both current and candidate satisfy fn, we cannot
90 /* otherwise, current can be discarded and candidate is still good */
93 static int match_hash(unsigned, const unsigned char *, const unsigned char *);
95 static enum cb_next
match_prefix(const struct object_id
*oid
, void *arg
)
97 struct disambiguate_state
*ds
= arg
;
98 /* no need to call match_hash, oidtree_each did prefix match */
99 update_candidates(ds
, oid
);
100 return ds
->ambiguous
? CB_BREAK
: CB_CONTINUE
;
103 static void find_short_object_filename(struct disambiguate_state
*ds
)
105 struct object_directory
*odb
;
107 for (odb
= ds
->repo
->objects
->odb
; odb
&& !ds
->ambiguous
; odb
= odb
->next
)
108 oidtree_each(odb_loose_cache(odb
, &ds
->bin_pfx
),
109 &ds
->bin_pfx
, ds
->len
, match_prefix
, ds
);
112 static int match_hash(unsigned len
, const unsigned char *a
, const unsigned char *b
)
122 if ((*a
^ *b
) & 0xf0)
127 static void unique_in_midx(struct multi_pack_index
*m
,
128 struct disambiguate_state
*ds
)
130 uint32_t num
, i
, first
= 0;
131 const struct object_id
*current
= NULL
;
132 num
= m
->num_objects
;
137 bsearch_midx(&ds
->bin_pfx
, m
, &first
);
140 * At this point, "first" is the location of the lowest object
141 * with an object name that could match "bin_pfx". See if we have
142 * 0, 1 or more objects that actually match(es).
144 for (i
= first
; i
< num
&& !ds
->ambiguous
; i
++) {
145 struct object_id oid
;
146 current
= nth_midxed_object_oid(&oid
, m
, i
);
147 if (!match_hash(ds
->len
, ds
->bin_pfx
.hash
, current
->hash
))
149 update_candidates(ds
, current
);
153 static void unique_in_pack(struct packed_git
*p
,
154 struct disambiguate_state
*ds
)
156 uint32_t num
, i
, first
= 0;
158 if (p
->multi_pack_index
)
161 if (open_pack_index(p
) || !p
->num_objects
)
164 num
= p
->num_objects
;
165 bsearch_pack(&ds
->bin_pfx
, p
, &first
);
168 * At this point, "first" is the location of the lowest object
169 * with an object name that could match "bin_pfx". See if we have
170 * 0, 1 or more objects that actually match(es).
172 for (i
= first
; i
< num
&& !ds
->ambiguous
; i
++) {
173 struct object_id oid
;
174 nth_packed_object_id(&oid
, p
, i
);
175 if (!match_hash(ds
->len
, ds
->bin_pfx
.hash
, oid
.hash
))
177 update_candidates(ds
, &oid
);
181 static void find_short_packed_object(struct disambiguate_state
*ds
)
183 struct multi_pack_index
*m
;
184 struct packed_git
*p
;
186 for (m
= get_multi_pack_index(ds
->repo
); m
&& !ds
->ambiguous
;
188 unique_in_midx(m
, ds
);
189 for (p
= get_packed_git(ds
->repo
); p
&& !ds
->ambiguous
;
191 unique_in_pack(p
, ds
);
194 static int finish_object_disambiguation(struct disambiguate_state
*ds
,
195 struct object_id
*oid
)
198 return SHORT_NAME_AMBIGUOUS
;
200 if (!ds
->candidate_exists
)
201 return MISSING_OBJECT
;
203 if (!ds
->candidate_checked
)
205 * If this is the only candidate, there is no point
206 * calling the disambiguation hint callback.
208 * On the other hand, if the current candidate
209 * replaced an earlier candidate that did _not_ pass
210 * the disambiguation hint callback, then we do have
211 * more than one objects that match the short name
212 * given, so we should make sure this one matches;
213 * otherwise, if we discovered this one and the one
214 * that we previously discarded in the reverse order,
215 * we would end up showing different results in the
218 ds
->candidate_ok
= (!ds
->disambiguate_fn_used
||
219 ds
->fn(ds
->repo
, &ds
->candidate
, ds
->cb_data
));
221 if (!ds
->candidate_ok
)
222 return SHORT_NAME_AMBIGUOUS
;
224 oidcpy(oid
, &ds
->candidate
);
228 static int disambiguate_commit_only(struct repository
*r
,
229 const struct object_id
*oid
,
230 void *cb_data UNUSED
)
232 int kind
= oid_object_info(r
, oid
, NULL
);
233 return kind
== OBJ_COMMIT
;
236 static int disambiguate_committish_only(struct repository
*r
,
237 const struct object_id
*oid
,
238 void *cb_data UNUSED
)
243 kind
= oid_object_info(r
, oid
, NULL
);
244 if (kind
== OBJ_COMMIT
)
249 /* We need to do this the hard way... */
250 obj
= deref_tag(r
, parse_object(r
, oid
), NULL
, 0);
251 if (obj
&& obj
->type
== OBJ_COMMIT
)
256 static int disambiguate_tree_only(struct repository
*r
,
257 const struct object_id
*oid
,
258 void *cb_data UNUSED
)
260 int kind
= oid_object_info(r
, oid
, NULL
);
261 return kind
== OBJ_TREE
;
264 static int disambiguate_treeish_only(struct repository
*r
,
265 const struct object_id
*oid
,
266 void *cb_data UNUSED
)
271 kind
= oid_object_info(r
, oid
, NULL
);
272 if (kind
== OBJ_TREE
|| kind
== OBJ_COMMIT
)
277 /* We need to do this the hard way... */
278 obj
= deref_tag(r
, parse_object(r
, oid
), NULL
, 0);
279 if (obj
&& (obj
->type
== OBJ_TREE
|| obj
->type
== OBJ_COMMIT
))
284 static int disambiguate_blob_only(struct repository
*r
,
285 const struct object_id
*oid
,
286 void *cb_data UNUSED
)
288 int kind
= oid_object_info(r
, oid
, NULL
);
289 return kind
== OBJ_BLOB
;
292 static disambiguate_hint_fn default_disambiguate_hint
;
294 int set_disambiguate_hint_config(const char *var
, const char *value
)
296 static const struct {
298 disambiguate_hint_fn fn
;
301 { "commit", disambiguate_commit_only
},
302 { "committish", disambiguate_committish_only
},
303 { "tree", disambiguate_tree_only
},
304 { "treeish", disambiguate_treeish_only
},
305 { "blob", disambiguate_blob_only
}
310 return config_error_nonbool(var
);
312 for (i
= 0; i
< ARRAY_SIZE(hints
); i
++) {
313 if (!strcasecmp(value
, hints
[i
].name
)) {
314 default_disambiguate_hint
= hints
[i
].fn
;
319 return error("unknown hint type for '%s': %s", var
, value
);
322 static int init_object_disambiguation(struct repository
*r
,
323 const char *name
, int len
,
324 struct disambiguate_state
*ds
)
328 if (len
< MINIMUM_ABBREV
|| len
> the_hash_algo
->hexsz
)
331 memset(ds
, 0, sizeof(*ds
));
333 for (i
= 0; i
< len
;i
++) {
334 unsigned char c
= name
[i
];
336 if (c
>= '0' && c
<= '9')
338 else if (c
>= 'a' && c
<= 'f')
340 else if (c
>= 'A' && c
<='F') {
349 ds
->bin_pfx
.hash
[i
>> 1] |= val
;
353 ds
->hex_pfx
[len
] = '\0';
359 struct ambiguous_output
{
360 const struct disambiguate_state
*ds
;
361 struct strbuf advice
;
365 static int show_ambiguous_object(const struct object_id
*oid
, void *data
)
367 struct ambiguous_output
*state
= data
;
368 const struct disambiguate_state
*ds
= state
->ds
;
369 struct strbuf
*advice
= &state
->advice
;
370 struct strbuf
*sb
= &state
->sb
;
374 if (ds
->fn
&& !ds
->fn(ds
->repo
, oid
, ds
->cb_data
))
377 hash
= repo_find_unique_abbrev(ds
->repo
, oid
, DEFAULT_ABBREV
);
378 type
= oid_object_info(ds
->repo
, oid
, NULL
);
382 * TRANSLATORS: This is a line of ambiguous object
383 * output shown when we cannot look up or parse the
384 * object in question. E.g. "deadbeef [bad object]".
386 strbuf_addf(sb
, _("%s [bad object]"), hash
);
390 assert(type
== OBJ_TREE
|| type
== OBJ_COMMIT
||
391 type
== OBJ_BLOB
|| type
== OBJ_TAG
);
393 if (type
== OBJ_COMMIT
) {
394 struct strbuf date
= STRBUF_INIT
;
395 struct strbuf msg
= STRBUF_INIT
;
396 struct commit
*commit
= lookup_commit(ds
->repo
, oid
);
399 struct pretty_print_context pp
= {0};
400 pp
.date_mode
.type
= DATE_SHORT
;
401 repo_format_commit_message(the_repository
, commit
,
403 repo_format_commit_message(the_repository
, commit
,
408 * TRANSLATORS: This is a line of ambiguous commit
409 * object output. E.g.:
411 * "deadbeef commit 2021-01-01 - Some Commit Message"
413 strbuf_addf(sb
, _("%s commit %s - %s"), hash
, date
.buf
,
416 strbuf_release(&date
);
417 strbuf_release(&msg
);
418 } else if (type
== OBJ_TAG
) {
419 struct tag
*tag
= lookup_tag(ds
->repo
, oid
);
421 if (!parse_tag(tag
) && tag
->tag
) {
423 * TRANSLATORS: This is a line of ambiguous
424 * tag object output. E.g.:
426 * "deadbeef tag 2022-01-01 - Some Tag Message"
428 * The second argument is the YYYY-MM-DD found
431 * The third argument is the "tag" string
434 strbuf_addf(sb
, _("%s tag %s - %s"), hash
,
435 show_date(tag
->date
, 0, DATE_MODE(SHORT
)),
439 * TRANSLATORS: This is a line of ambiguous
440 * tag object output where we couldn't parse
441 * the tag itself. E.g.:
443 * "deadbeef [bad tag, could not parse it]"
445 strbuf_addf(sb
, _("%s [bad tag, could not parse it]"),
448 } else if (type
== OBJ_TREE
) {
450 * TRANSLATORS: This is a line of ambiguous <type>
451 * object output. E.g. "deadbeef tree".
453 strbuf_addf(sb
, _("%s tree"), hash
);
454 } else if (type
== OBJ_BLOB
) {
456 * TRANSLATORS: This is a line of ambiguous <type>
457 * object output. E.g. "deadbeef blob".
459 strbuf_addf(sb
, _("%s blob"), hash
);
465 * TRANSLATORS: This is line item of ambiguous object output
466 * from describe_ambiguous_object() above. For RTL languages
467 * you'll probably want to swap the "%s" and leading " " space
470 strbuf_addf(advice
, _(" %s\n"), sb
->buf
);
476 static int collect_ambiguous(const struct object_id
*oid
, void *data
)
478 oid_array_append(data
, oid
);
482 static int repo_collect_ambiguous(struct repository
*r UNUSED
,
483 const struct object_id
*oid
,
486 return collect_ambiguous(oid
, data
);
489 static int sort_ambiguous(const void *a
, const void *b
, void *ctx
)
491 struct repository
*sort_ambiguous_repo
= ctx
;
492 int a_type
= oid_object_info(sort_ambiguous_repo
, a
, NULL
);
493 int b_type
= oid_object_info(sort_ambiguous_repo
, b
, NULL
);
498 * Sorts by hash within the same object type, just as
499 * oid_array_for_each_unique() would do.
501 if (a_type
== b_type
)
505 * Between object types show tags, then commits, and finally
508 * The object_type enum is commit, tree, blob, tag, but we
509 * want tag, commit, tree blob. Cleverly (perhaps too
510 * cleverly) do that with modulus, since the enum assigns 1 to
511 * commit, so tag becomes 0.
513 a_type_sort
= a_type
% 4;
514 b_type_sort
= b_type
% 4;
515 return a_type_sort
> b_type_sort
? 1 : -1;
518 static void sort_ambiguous_oid_array(struct repository
*r
, struct oid_array
*a
)
520 QSORT_S(a
->oid
, a
->nr
, sort_ambiguous
, r
);
523 static enum get_oid_result
get_short_oid(struct repository
*r
,
524 const char *name
, int len
,
525 struct object_id
*oid
,
529 struct disambiguate_state ds
;
530 int quietly
= !!(flags
& GET_OID_QUIETLY
);
532 if (init_object_disambiguation(r
, name
, len
, &ds
) < 0)
535 if (HAS_MULTI_BITS(flags
& GET_OID_DISAMBIGUATORS
))
536 BUG("multiple get_short_oid disambiguator flags");
538 if (flags
& GET_OID_COMMIT
)
539 ds
.fn
= disambiguate_commit_only
;
540 else if (flags
& GET_OID_COMMITTISH
)
541 ds
.fn
= disambiguate_committish_only
;
542 else if (flags
& GET_OID_TREE
)
543 ds
.fn
= disambiguate_tree_only
;
544 else if (flags
& GET_OID_TREEISH
)
545 ds
.fn
= disambiguate_treeish_only
;
546 else if (flags
& GET_OID_BLOB
)
547 ds
.fn
= disambiguate_blob_only
;
549 ds
.fn
= default_disambiguate_hint
;
551 find_short_object_filename(&ds
);
552 find_short_packed_object(&ds
);
553 status
= finish_object_disambiguation(&ds
, oid
);
556 * If we didn't find it, do the usual reprepare() slow-path,
557 * since the object may have recently been added to the repository
558 * or migrated from loose to packed.
560 if (status
== MISSING_OBJECT
) {
561 reprepare_packed_git(r
);
562 find_short_object_filename(&ds
);
563 find_short_packed_object(&ds
);
564 status
= finish_object_disambiguation(&ds
, oid
);
567 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
)) {
568 struct oid_array collect
= OID_ARRAY_INIT
;
569 struct ambiguous_output out
= {
572 .advice
= STRBUF_INIT
,
575 error(_("short object ID %s is ambiguous"), ds
.hex_pfx
);
578 * We may still have ambiguity if we simply saw a series of
579 * candidates that did not satisfy our hint function. In
580 * that case, we still want to show them, so disable the hint
586 repo_for_each_abbrev(r
, ds
.hex_pfx
, collect_ambiguous
, &collect
);
587 sort_ambiguous_oid_array(r
, &collect
);
589 if (oid_array_for_each(&collect
, show_ambiguous_object
, &out
))
590 BUG("show_ambiguous_object shouldn't return non-zero");
593 * TRANSLATORS: The argument is the list of ambiguous
594 * objects composed in show_ambiguous_object(). See
595 * its "TRANSLATORS" comments for details.
597 advise(_("The candidates are:\n%s"), out
.advice
.buf
);
599 oid_array_clear(&collect
);
600 strbuf_release(&out
.advice
);
601 strbuf_release(&out
.sb
);
607 int repo_for_each_abbrev(struct repository
*r
, const char *prefix
,
608 each_abbrev_fn fn
, void *cb_data
)
610 struct oid_array collect
= OID_ARRAY_INIT
;
611 struct disambiguate_state ds
;
614 if (init_object_disambiguation(r
, prefix
, strlen(prefix
), &ds
) < 0)
617 ds
.always_call_fn
= 1;
618 ds
.fn
= repo_collect_ambiguous
;
619 ds
.cb_data
= &collect
;
620 find_short_object_filename(&ds
);
621 find_short_packed_object(&ds
);
623 ret
= oid_array_for_each_unique(&collect
, fn
, cb_data
);
624 oid_array_clear(&collect
);
629 * Return the slot of the most-significant bit set in "val". There are various
630 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
631 * probably not a big deal here.
633 static unsigned msb(unsigned long val
)
641 struct min_abbrev_data
{
642 unsigned int init_len
;
643 unsigned int cur_len
;
645 struct repository
*repo
;
646 const struct object_id
*oid
;
649 static inline char get_hex_char_from_oid(const struct object_id
*oid
,
652 static const char hex
[] = "0123456789abcdef";
655 return hex
[oid
->hash
[pos
>> 1] >> 4];
657 return hex
[oid
->hash
[pos
>> 1] & 0xf];
660 static int extend_abbrev_len(const struct object_id
*oid
, void *cb_data
)
662 struct min_abbrev_data
*mad
= cb_data
;
664 unsigned int i
= mad
->init_len
;
665 while (mad
->hex
[i
] && mad
->hex
[i
] == get_hex_char_from_oid(oid
, i
))
668 if (i
< GIT_MAX_RAWSZ
&& i
>= mad
->cur_len
)
669 mad
->cur_len
= i
+ 1;
674 static int repo_extend_abbrev_len(struct repository
*r UNUSED
,
675 const struct object_id
*oid
,
678 return extend_abbrev_len(oid
, cb_data
);
681 static void find_abbrev_len_for_midx(struct multi_pack_index
*m
,
682 struct min_abbrev_data
*mad
)
685 uint32_t num
, first
= 0;
686 struct object_id oid
;
687 const struct object_id
*mad_oid
;
692 num
= m
->num_objects
;
694 match
= bsearch_midx(mad_oid
, m
, &first
);
697 * first is now the position in the packfile where we would insert
698 * mad->hash if it does not exist (or the position of mad->hash if
699 * it does exist). Hence, we consider a maximum of two objects
700 * nearby for the abbreviation length.
704 if (nth_midxed_object_oid(&oid
, m
, first
))
705 extend_abbrev_len(&oid
, mad
);
706 } else if (first
< num
- 1) {
707 if (nth_midxed_object_oid(&oid
, m
, first
+ 1))
708 extend_abbrev_len(&oid
, mad
);
711 if (nth_midxed_object_oid(&oid
, m
, first
- 1))
712 extend_abbrev_len(&oid
, mad
);
714 mad
->init_len
= mad
->cur_len
;
717 static void find_abbrev_len_for_pack(struct packed_git
*p
,
718 struct min_abbrev_data
*mad
)
721 uint32_t num
, first
= 0;
722 struct object_id oid
;
723 const struct object_id
*mad_oid
;
725 if (p
->multi_pack_index
)
728 if (open_pack_index(p
) || !p
->num_objects
)
731 num
= p
->num_objects
;
733 match
= bsearch_pack(mad_oid
, p
, &first
);
736 * first is now the position in the packfile where we would insert
737 * mad->hash if it does not exist (or the position of mad->hash if
738 * it does exist). Hence, we consider a maximum of two objects
739 * nearby for the abbreviation length.
743 if (!nth_packed_object_id(&oid
, p
, first
))
744 extend_abbrev_len(&oid
, mad
);
745 } else if (first
< num
- 1) {
746 if (!nth_packed_object_id(&oid
, p
, first
+ 1))
747 extend_abbrev_len(&oid
, mad
);
750 if (!nth_packed_object_id(&oid
, p
, first
- 1))
751 extend_abbrev_len(&oid
, mad
);
753 mad
->init_len
= mad
->cur_len
;
756 static void find_abbrev_len_packed(struct min_abbrev_data
*mad
)
758 struct multi_pack_index
*m
;
759 struct packed_git
*p
;
761 for (m
= get_multi_pack_index(mad
->repo
); m
; m
= m
->next
)
762 find_abbrev_len_for_midx(m
, mad
);
763 for (p
= get_packed_git(mad
->repo
); p
; p
= p
->next
)
764 find_abbrev_len_for_pack(p
, mad
);
767 int repo_find_unique_abbrev_r(struct repository
*r
, char *hex
,
768 const struct object_id
*oid
, int len
)
770 struct disambiguate_state ds
;
771 struct min_abbrev_data mad
;
772 struct object_id oid_ret
;
773 const unsigned hexsz
= r
->hash_algo
->hexsz
;
776 unsigned long count
= repo_approximate_object_count(r
);
778 * Add one because the MSB only tells us the highest bit set,
779 * not including the value of all the _other_ bits (so "15"
780 * is only one off of 2^4, but the MSB is the 3rd bit.
782 len
= msb(count
) + 1;
784 * We now know we have on the order of 2^len objects, which
785 * expects a collision at 2^(len/2). But we also care about hex
786 * chars, not bits, and there are 4 bits per hex. So all
787 * together we need to divide by 2 and round up.
789 len
= DIV_ROUND_UP(len
, 2);
791 * For very small repos, we stick with our regular fallback.
793 if (len
< FALLBACK_DEFAULT_ABBREV
)
794 len
= FALLBACK_DEFAULT_ABBREV
;
797 oid_to_hex_r(hex
, oid
);
798 if (len
== hexsz
|| !len
)
807 find_abbrev_len_packed(&mad
);
809 if (init_object_disambiguation(r
, hex
, mad
.cur_len
, &ds
) < 0)
812 ds
.fn
= repo_extend_abbrev_len
;
813 ds
.always_call_fn
= 1;
814 ds
.cb_data
= (void *)&mad
;
816 find_short_object_filename(&ds
);
817 (void)finish_object_disambiguation(&ds
, &oid_ret
);
819 hex
[mad
.cur_len
] = 0;
823 const char *repo_find_unique_abbrev(struct repository
*r
,
824 const struct object_id
*oid
,
828 static char hexbuffer
[4][GIT_MAX_HEXSZ
+ 1];
829 char *hex
= hexbuffer
[bufno
];
830 bufno
= (bufno
+ 1) % ARRAY_SIZE(hexbuffer
);
831 repo_find_unique_abbrev_r(r
, hex
, oid
, len
);
835 static int ambiguous_path(const char *path
, int len
)
840 for (cnt
= 0; cnt
< len
; cnt
++) {
860 static inline int at_mark(const char *string
, int len
,
861 const char **suffix
, int nr
)
865 for (i
= 0; i
< nr
; i
++) {
866 int suffix_len
= strlen(suffix
[i
]);
867 if (suffix_len
<= len
868 && !strncasecmp(string
, suffix
[i
], suffix_len
))
874 static inline int upstream_mark(const char *string
, int len
)
876 const char *suffix
[] = { "@{upstream}", "@{u}" };
877 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
880 static inline int push_mark(const char *string
, int len
)
882 const char *suffix
[] = { "@{push}" };
883 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
886 static enum get_oid_result
get_oid_1(struct repository
*r
, const char *name
, int len
, struct object_id
*oid
, unsigned lookup_flags
);
887 static int interpret_nth_prior_checkout(struct repository
*r
, const char *name
, int namelen
, struct strbuf
*buf
);
889 static int get_oid_basic(struct repository
*r
, const char *str
, int len
,
890 struct object_id
*oid
, unsigned int flags
)
892 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
893 static const char *object_name_msg
= N_(
894 "Git normally never creates a ref that ends with 40 hex characters\n"
895 "because it will be ignored when you just specify 40-hex. These refs\n"
896 "may be created by mistake. For example,\n"
898 " git switch -c $br $(git rev-parse ...)\n"
900 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
901 "examine these refs and maybe delete them. Turn this message off by\n"
902 "running \"git config advice.objectNameWarning false\"");
903 struct object_id tmp_oid
;
904 char *real_ref
= NULL
;
906 int at
, reflog_len
, nth_prior
= 0;
907 int fatal
= !(flags
& GET_OID_QUIETLY
);
909 if (len
== r
->hash_algo
->hexsz
&& !get_oid_hex(str
, oid
)) {
910 if (warn_ambiguous_refs
&& warn_on_object_refname_ambiguity
) {
911 refs_found
= repo_dwim_ref(r
, str
, len
, &tmp_oid
, &real_ref
, 0);
912 if (refs_found
> 0) {
913 warning(warn_msg
, len
, str
);
914 if (advice_enabled(ADVICE_OBJECT_NAME_WARNING
))
915 fprintf(stderr
, "%s\n", _(object_name_msg
));
922 /* basic@{time or number or -number} format to query ref-log */
924 if (len
&& str
[len
-1] == '}') {
925 for (at
= len
-4; at
>= 0; at
--) {
926 if (str
[at
] == '@' && str
[at
+1] == '{') {
927 if (str
[at
+2] == '-') {
929 /* @{-N} not at start */
934 if (!upstream_mark(str
+ at
, len
- at
) &&
935 !push_mark(str
+ at
, len
- at
)) {
936 reflog_len
= (len
-1) - (at
+2);
944 /* Accept only unambiguous ref paths. */
945 if (len
&& ambiguous_path(str
, len
))
949 struct strbuf buf
= STRBUF_INIT
;
952 if (interpret_nth_prior_checkout(r
, str
, len
, &buf
) > 0) {
953 detached
= (buf
.len
== r
->hash_algo
->hexsz
&& !get_oid_hex(buf
.buf
, oid
));
954 strbuf_release(&buf
);
960 if (!len
&& reflog_len
)
961 /* allow "@{...}" to mean the current branch reflog */
962 refs_found
= repo_dwim_ref(r
, "HEAD", 4, oid
, &real_ref
, !fatal
);
964 refs_found
= repo_dwim_log(r
, str
, len
, oid
, &real_ref
);
966 refs_found
= repo_dwim_ref(r
, str
, len
, oid
, &real_ref
, !fatal
);
971 if (warn_ambiguous_refs
&& !(flags
& GET_OID_QUIETLY
) &&
973 !get_short_oid(r
, str
, len
, &tmp_oid
, GET_OID_QUIETLY
)))
974 warning(warn_msg
, len
, str
);
982 /* Is it asking for N-th entry, or approxidate? */
983 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
984 char ch
= str
[at
+2+i
];
985 if ('0' <= ch
&& ch
<= '9')
986 nth
= nth
* 10 + ch
- '0';
990 if (100000000 <= nth
) {
997 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
998 at_time
= approxidate_careful(tmp
, &errors
);
1005 if (read_ref_at(get_main_ref_store(r
),
1006 real_ref
, flags
, at_time
, nth
, oid
, NULL
,
1007 &co_time
, &co_tz
, &co_cnt
)) {
1009 if (!skip_prefix(real_ref
, "refs/heads/", &str
))
1014 if (!(flags
& GET_OID_QUIETLY
)) {
1015 warning(_("log for '%.*s' only goes back to %s"),
1017 show_date(co_time
, co_tz
, DATE_MODE(RFC2822
)));
1020 if (flags
& GET_OID_QUIETLY
) {
1023 die(_("log for '%.*s' only has %d entries"),
1033 static enum get_oid_result
get_parent(struct repository
*r
,
1034 const char *name
, int len
,
1035 struct object_id
*result
, int idx
)
1037 struct object_id oid
;
1038 enum get_oid_result ret
= get_oid_1(r
, name
, len
, &oid
,
1039 GET_OID_COMMITTISH
);
1040 struct commit
*commit
;
1041 struct commit_list
*p
;
1045 commit
= lookup_commit_reference(r
, &oid
);
1046 if (repo_parse_commit(r
, commit
))
1047 return MISSING_OBJECT
;
1049 oidcpy(result
, &commit
->object
.oid
);
1052 p
= commit
->parents
;
1055 oidcpy(result
, &p
->item
->object
.oid
);
1060 return MISSING_OBJECT
;
1063 static enum get_oid_result
get_nth_ancestor(struct repository
*r
,
1064 const char *name
, int len
,
1065 struct object_id
*result
,
1068 struct object_id oid
;
1069 struct commit
*commit
;
1072 ret
= get_oid_1(r
, name
, len
, &oid
, GET_OID_COMMITTISH
);
1075 commit
= lookup_commit_reference(r
, &oid
);
1077 return MISSING_OBJECT
;
1079 while (generation
--) {
1080 if (repo_parse_commit(r
, commit
) || !commit
->parents
)
1081 return MISSING_OBJECT
;
1082 commit
= commit
->parents
->item
;
1084 oidcpy(result
, &commit
->object
.oid
);
1088 struct object
*repo_peel_to_type(struct repository
*r
, const char *name
, int namelen
,
1089 struct object
*o
, enum object_type expected_type
)
1091 if (name
&& !namelen
)
1092 namelen
= strlen(name
);
1094 if (!o
|| (!o
->parsed
&& !parse_object(r
, &o
->oid
)))
1096 if (expected_type
== OBJ_ANY
|| o
->type
== expected_type
)
1098 if (o
->type
== OBJ_TAG
)
1099 o
= ((struct tag
*) o
)->tagged
;
1100 else if (o
->type
== OBJ_COMMIT
)
1101 o
= &(repo_get_commit_tree(r
, ((struct commit
*)o
))->object
);
1104 error("%.*s: expected %s type, but the object "
1105 "dereferences to %s type",
1106 namelen
, name
, type_name(expected_type
),
1107 type_name(o
->type
));
1113 static int peel_onion(struct repository
*r
, const char *name
, int len
,
1114 struct object_id
*oid
, unsigned lookup_flags
)
1116 struct object_id outer
;
1118 unsigned int expected_type
= 0;
1122 * "ref^{type}" dereferences ref repeatedly until you cannot
1123 * dereference anymore, or you get an object of given type,
1124 * whichever comes first. "ref^{}" means just dereference
1125 * tags until you get a non-tag. "ref^0" is a shorthand for
1126 * "ref^{commit}". "commit^{tree}" could be used to find the
1127 * top-level tree of the given commit.
1129 if (len
< 4 || name
[len
-1] != '}')
1132 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
1134 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
1140 sp
++; /* beginning of type name, or closing brace for empty */
1141 if (starts_with(sp
, "commit}"))
1142 expected_type
= OBJ_COMMIT
;
1143 else if (starts_with(sp
, "tag}"))
1144 expected_type
= OBJ_TAG
;
1145 else if (starts_with(sp
, "tree}"))
1146 expected_type
= OBJ_TREE
;
1147 else if (starts_with(sp
, "blob}"))
1148 expected_type
= OBJ_BLOB
;
1149 else if (starts_with(sp
, "object}"))
1150 expected_type
= OBJ_ANY
;
1151 else if (sp
[0] == '}')
1152 expected_type
= OBJ_NONE
;
1153 else if (sp
[0] == '/')
1154 expected_type
= OBJ_COMMIT
;
1158 lookup_flags
&= ~GET_OID_DISAMBIGUATORS
;
1159 if (expected_type
== OBJ_COMMIT
)
1160 lookup_flags
|= GET_OID_COMMITTISH
;
1161 else if (expected_type
== OBJ_TREE
)
1162 lookup_flags
|= GET_OID_TREEISH
;
1164 if (get_oid_1(r
, name
, sp
- name
- 2, &outer
, lookup_flags
))
1167 o
= parse_object(r
, &outer
);
1170 if (!expected_type
) {
1171 o
= deref_tag(r
, o
, name
, sp
- name
- 2);
1172 if (!o
|| (!o
->parsed
&& !parse_object(r
, &o
->oid
)))
1174 oidcpy(oid
, &o
->oid
);
1179 * At this point, the syntax look correct, so
1180 * if we do not get the needed object, we should
1183 o
= repo_peel_to_type(r
, name
, len
, o
, expected_type
);
1187 oidcpy(oid
, &o
->oid
);
1189 /* "$commit^{/foo}" */
1192 struct commit_list
*list
= NULL
;
1195 * $commit^{/}. Some regex implementation may reject.
1196 * We don't need regex anyway. '' pattern always matches.
1201 prefix
= xstrndup(sp
+ 1, name
+ len
- 1 - (sp
+ 1));
1202 commit_list_insert((struct commit
*)o
, &list
);
1203 ret
= get_oid_oneline(r
, prefix
, oid
, list
);
1210 static int get_describe_name(struct repository
*r
,
1211 const char *name
, int len
,
1212 struct object_id
*oid
)
1215 unsigned flags
= GET_OID_QUIETLY
| GET_OID_COMMIT
;
1217 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
1219 if (!isxdigit(ch
)) {
1220 /* We must be looking at g in "SOMETHING-g"
1221 * for it to be describe output.
1223 if (ch
== 'g' && cp
[-1] == '-') {
1226 return get_short_oid(r
,
1227 cp
, len
, oid
, flags
);
1234 static enum get_oid_result
get_oid_1(struct repository
*r
,
1235 const char *name
, int len
,
1236 struct object_id
*oid
,
1237 unsigned lookup_flags
)
1239 int ret
, has_suffix
;
1243 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
1246 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
1248 if ('0' <= ch
&& ch
<= '9')
1250 if (ch
== '~' || ch
== '^')
1256 unsigned int num
= 0;
1257 int len1
= cp
- name
;
1259 while (cp
< name
+ len
) {
1260 unsigned int digit
= *cp
++ - '0';
1261 if (unsigned_mult_overflows(num
, 10))
1262 return MISSING_OBJECT
;
1264 if (unsigned_add_overflows(num
, digit
))
1265 return MISSING_OBJECT
;
1268 if (!num
&& len1
== len
- 1)
1270 else if (num
> INT_MAX
)
1271 return MISSING_OBJECT
;
1272 if (has_suffix
== '^')
1273 return get_parent(r
, name
, len1
, oid
, num
);
1274 /* else if (has_suffix == '~') -- goes without saying */
1275 return get_nth_ancestor(r
, name
, len1
, oid
, num
);
1278 ret
= peel_onion(r
, name
, len
, oid
, lookup_flags
);
1282 ret
= get_oid_basic(r
, name
, len
, oid
, lookup_flags
);
1286 /* It could be describe output that is "SOMETHING-gXXXX" */
1287 ret
= get_describe_name(r
, name
, len
, oid
);
1291 return get_short_oid(r
, name
, len
, oid
, lookup_flags
);
1295 * This interprets names like ':/Initial revision of "git"' by searching
1296 * through history and returning the first commit whose message starts
1297 * the given regular expression.
1299 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1301 * For a literal '!' character at the beginning of a pattern, you have to repeat
1302 * that, like: ':/!!foo'
1304 * For future extension, all other sequences beginning with ':/!' are reserved.
1307 /* Remember to update object flag allocation in object.h */
1308 #define ONELINE_SEEN (1u<<20)
1310 struct handle_one_ref_cb
{
1311 struct repository
*repo
;
1312 struct commit_list
**list
;
1315 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1319 struct handle_one_ref_cb
*cb
= cb_data
;
1320 struct commit_list
**list
= cb
->list
;
1321 struct object
*object
= parse_object(cb
->repo
, oid
);
1324 if (object
->type
== OBJ_TAG
) {
1325 object
= deref_tag(cb
->repo
, object
, path
,
1330 if (object
->type
!= OBJ_COMMIT
)
1332 commit_list_insert((struct commit
*)object
, list
);
1336 static int get_oid_oneline(struct repository
*r
,
1337 const char *prefix
, struct object_id
*oid
,
1338 struct commit_list
*list
)
1340 struct commit_list
*backup
= NULL
, *l
;
1345 if (prefix
[0] == '!') {
1348 if (prefix
[0] == '-') {
1351 } else if (prefix
[0] != '!') {
1356 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
1359 for (l
= list
; l
; l
= l
->next
) {
1360 l
->item
->object
.flags
|= ONELINE_SEEN
;
1361 commit_list_insert(l
->item
, &backup
);
1364 const char *p
, *buf
;
1365 struct commit
*commit
;
1368 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
1369 if (!parse_object(r
, &commit
->object
.oid
))
1371 buf
= repo_get_commit_buffer(r
, commit
, NULL
);
1372 p
= strstr(buf
, "\n\n");
1373 matches
= negative
^ (p
&& !regexec(®ex
, p
+ 2, 0, NULL
, 0));
1374 repo_unuse_commit_buffer(r
, commit
, buf
);
1377 oidcpy(oid
, &commit
->object
.oid
);
1383 free_commit_list(list
);
1384 for (l
= backup
; l
; l
= l
->next
)
1385 clear_commit_marks(l
->item
, ONELINE_SEEN
);
1386 free_commit_list(backup
);
1387 return found
? 0 : -1;
1390 struct grab_nth_branch_switch_cbdata
{
1395 static int grab_nth_branch_switch(struct object_id
*ooid UNUSED
,
1396 struct object_id
*noid UNUSED
,
1397 const char *email UNUSED
,
1398 timestamp_t timestamp UNUSED
,
1400 const char *message
, void *cb_data
)
1402 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
1403 const char *match
= NULL
, *target
= NULL
;
1406 if (skip_prefix(message
, "checkout: moving from ", &match
))
1407 target
= strstr(match
, " to ");
1409 if (!match
|| !target
)
1411 if (--(cb
->remaining
) == 0) {
1412 len
= target
- match
;
1413 strbuf_reset(cb
->sb
);
1414 strbuf_add(cb
->sb
, match
, len
);
1415 return 1; /* we are done */
1421 * Parse @{-N} syntax, return the number of characters parsed
1422 * if successful; otherwise signal an error with negative value.
1424 static int interpret_nth_prior_checkout(struct repository
*r
,
1425 const char *name
, int namelen
,
1430 struct grab_nth_branch_switch_cbdata cb
;
1436 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
1438 brace
= memchr(name
, '}', namelen
);
1441 nth
= strtol(name
+ 3, &num_end
, 10);
1442 if (num_end
!= brace
)
1449 retval
= refs_for_each_reflog_ent_reverse(get_main_ref_store(r
),
1450 "HEAD", grab_nth_branch_switch
, &cb
);
1452 retval
= brace
- name
+ 1;
1459 int repo_get_oid_mb(struct repository
*r
,
1461 struct object_id
*oid
)
1463 struct commit
*one
, *two
;
1464 struct commit_list
*mbs
;
1465 struct object_id oid_tmp
;
1469 dots
= strstr(name
, "...");
1471 return repo_get_oid(r
, name
, oid
);
1473 st
= repo_get_oid(r
, "HEAD", &oid_tmp
);
1476 strbuf_init(&sb
, dots
- name
);
1477 strbuf_add(&sb
, name
, dots
- name
);
1478 st
= repo_get_oid_committish(r
, sb
.buf
, &oid_tmp
);
1479 strbuf_release(&sb
);
1483 one
= lookup_commit_reference_gently(r
, &oid_tmp
, 0);
1487 if (repo_get_oid_committish(r
, dots
[3] ? (dots
+ 3) : "HEAD", &oid_tmp
))
1489 two
= lookup_commit_reference_gently(r
, &oid_tmp
, 0);
1492 mbs
= repo_get_merge_bases(r
, one
, two
);
1493 if (!mbs
|| mbs
->next
)
1497 oidcpy(oid
, &mbs
->item
->object
.oid
);
1499 free_commit_list(mbs
);
1503 /* parse @something syntax, when 'something' is not {.*} */
1504 static int interpret_empty_at(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1508 if (len
|| name
[1] == '{')
1511 /* make sure it's a single @, or @@{.*}, not @foo */
1512 next
= memchr(name
+ len
+ 1, '@', namelen
- len
- 1);
1513 if (next
&& next
[1] != '{')
1516 next
= name
+ namelen
;
1517 if (next
!= name
+ 1)
1521 strbuf_add(buf
, "HEAD", 4);
1525 static int reinterpret(struct repository
*r
,
1526 const char *name
, int namelen
, int len
,
1527 struct strbuf
*buf
, unsigned allowed
)
1529 /* we have extra data, which might need further processing */
1530 struct strbuf tmp
= STRBUF_INIT
;
1531 int used
= buf
->len
;
1533 struct interpret_branch_name_options options
= {
1537 strbuf_add(buf
, name
+ len
, namelen
- len
);
1538 ret
= repo_interpret_branch_name(r
, buf
->buf
, buf
->len
, &tmp
, &options
);
1539 /* that data was not interpreted, remove our cruft */
1541 strbuf_setlen(buf
, used
);
1545 strbuf_addbuf(buf
, &tmp
);
1546 strbuf_release(&tmp
);
1547 /* tweak for size of {-N} versus expanded ref name */
1548 return ret
- used
+ len
;
1551 static void set_shortened_ref(struct repository
*r
, struct strbuf
*buf
, const char *ref
)
1553 char *s
= refs_shorten_unambiguous_ref(get_main_ref_store(r
), ref
, 0);
1555 strbuf_addstr(buf
, s
);
1559 static int branch_interpret_allowed(const char *refname
, unsigned allowed
)
1564 if ((allowed
& INTERPRET_BRANCH_LOCAL
) &&
1565 starts_with(refname
, "refs/heads/"))
1567 if ((allowed
& INTERPRET_BRANCH_REMOTE
) &&
1568 starts_with(refname
, "refs/remotes/"))
1574 static int interpret_branch_mark(struct repository
*r
,
1575 const char *name
, int namelen
,
1576 int at
, struct strbuf
*buf
,
1577 int (*get_mark
)(const char *, int),
1578 const char *(*get_data
)(struct branch
*,
1580 const struct interpret_branch_name_options
*options
)
1583 struct branch
*branch
;
1584 struct strbuf err
= STRBUF_INIT
;
1587 len
= get_mark(name
+ at
, namelen
- at
);
1591 if (memchr(name
, ':', at
))
1595 char *name_str
= xmemdupz(name
, at
);
1596 branch
= branch_get(name_str
);
1599 branch
= branch_get(NULL
);
1601 value
= get_data(branch
, &err
);
1603 if (options
->nonfatal_dangling_mark
) {
1604 strbuf_release(&err
);
1611 if (!branch_interpret_allowed(value
, options
->allowed
))
1614 set_shortened_ref(r
, buf
, value
);
1618 int repo_interpret_branch_name(struct repository
*r
,
1619 const char *name
, int namelen
,
1621 const struct interpret_branch_name_options
*options
)
1628 namelen
= strlen(name
);
1630 if (!options
->allowed
|| (options
->allowed
& INTERPRET_BRANCH_LOCAL
)) {
1631 len
= interpret_nth_prior_checkout(r
, name
, namelen
, buf
);
1633 return len
; /* syntax Ok, not enough switches */
1634 } else if (len
> 0) {
1636 return len
; /* consumed all */
1638 return reinterpret(r
, name
, namelen
, len
, buf
,
1644 (at
= memchr(start
, '@', namelen
- (start
- name
)));
1647 if (!options
->allowed
|| (options
->allowed
& INTERPRET_BRANCH_HEAD
)) {
1648 len
= interpret_empty_at(name
, namelen
, at
- name
, buf
);
1650 return reinterpret(r
, name
, namelen
, len
, buf
,
1654 len
= interpret_branch_mark(r
, name
, namelen
, at
- name
, buf
,
1655 upstream_mark
, branch_get_upstream
,
1660 len
= interpret_branch_mark(r
, name
, namelen
, at
- name
, buf
,
1661 push_mark
, branch_get_push
,
1670 void strbuf_branchname(struct strbuf
*sb
, const char *name
, unsigned allowed
)
1672 int len
= strlen(name
);
1673 struct interpret_branch_name_options options
= {
1676 int used
= repo_interpret_branch_name(the_repository
, name
, len
, sb
,
1681 strbuf_add(sb
, name
+ used
, len
- used
);
1684 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
1686 if (startup_info
->have_repository
)
1687 strbuf_branchname(sb
, name
, INTERPRET_BRANCH_LOCAL
);
1689 strbuf_addstr(sb
, name
);
1692 * This splice must be done even if we end up rejecting the
1693 * name; builtin/branch.c::copy_or_rename_branch() still wants
1694 * to see what the name expanded to so that "branch -m" can be
1695 * used as a tool to correct earlier mistakes.
1697 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
1700 !strcmp(sb
->buf
, "refs/heads/HEAD"))
1703 return check_refname_format(sb
->buf
, 0);
1707 * This is like "get_oid_basic()", except it allows "object ID expressions",
1708 * notably "xyz^" for "parent of xyz"
1710 int repo_get_oid(struct repository
*r
, const char *name
, struct object_id
*oid
)
1712 struct object_context unused
;
1713 return get_oid_with_context(r
, name
, 0, oid
, &unused
);
1717 * This returns a non-zero value if the string (built using printf
1718 * format and the given arguments) is not a valid object.
1720 int get_oidf(struct object_id
*oid
, const char *fmt
, ...)
1724 struct strbuf sb
= STRBUF_INIT
;
1727 strbuf_vaddf(&sb
, fmt
, ap
);
1730 ret
= repo_get_oid(the_repository
, sb
.buf
, oid
);
1731 strbuf_release(&sb
);
1737 * Many callers know that the user meant to name a commit-ish by
1738 * syntactical positions where the object name appears. Calling this
1739 * function allows the machinery to disambiguate shorter-than-unique
1740 * abbreviated object names between commit-ish and others.
1742 * Note that this does NOT error out when the named object is not a
1743 * commit-ish. It is merely to give a hint to the disambiguation
1746 int repo_get_oid_committish(struct repository
*r
,
1748 struct object_id
*oid
)
1750 struct object_context unused
;
1751 return get_oid_with_context(r
, name
, GET_OID_COMMITTISH
,
1755 int repo_get_oid_treeish(struct repository
*r
,
1757 struct object_id
*oid
)
1759 struct object_context unused
;
1760 return get_oid_with_context(r
, name
, GET_OID_TREEISH
,
1764 int repo_get_oid_commit(struct repository
*r
,
1766 struct object_id
*oid
)
1768 struct object_context unused
;
1769 return get_oid_with_context(r
, name
, GET_OID_COMMIT
,
1773 int repo_get_oid_tree(struct repository
*r
,
1775 struct object_id
*oid
)
1777 struct object_context unused
;
1778 return get_oid_with_context(r
, name
, GET_OID_TREE
,
1782 int repo_get_oid_blob(struct repository
*r
,
1784 struct object_id
*oid
)
1786 struct object_context unused
;
1787 return get_oid_with_context(r
, name
, GET_OID_BLOB
,
1791 /* Must be called only when object_name:filename doesn't exist. */
1792 static void diagnose_invalid_oid_path(struct repository
*r
,
1794 const char *filename
,
1795 const struct object_id
*tree_oid
,
1796 const char *object_name
,
1797 int object_name_len
)
1799 struct object_id oid
;
1800 unsigned short mode
;
1805 if (file_exists(filename
))
1806 die(_("path '%s' exists on disk, but not in '%.*s'"),
1807 filename
, object_name_len
, object_name
);
1808 if (is_missing_file_error(errno
)) {
1809 char *fullname
= xstrfmt("%s%s", prefix
, filename
);
1811 if (!get_tree_entry(r
, tree_oid
, fullname
, &oid
, &mode
)) {
1812 die(_("path '%s' exists, but not '%s'\n"
1813 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
1816 object_name_len
, object_name
,
1818 object_name_len
, object_name
,
1821 die(_("path '%s' does not exist in '%.*s'"),
1822 filename
, object_name_len
, object_name
);
1826 /* Must be called only when :stage:filename doesn't exist. */
1827 static void diagnose_invalid_index_path(struct repository
*r
,
1830 const char *filename
)
1832 struct index_state
*istate
= r
->index
;
1833 const struct cache_entry
*ce
;
1835 unsigned namelen
= strlen(filename
);
1836 struct strbuf fullname
= STRBUF_INIT
;
1841 /* Wrong stage number? */
1842 pos
= index_name_pos(istate
, filename
, namelen
);
1845 if (pos
< istate
->cache_nr
) {
1846 ce
= istate
->cache
[pos
];
1847 if (!S_ISSPARSEDIR(ce
->ce_mode
) &&
1848 ce_namelen(ce
) == namelen
&&
1849 !memcmp(ce
->name
, filename
, namelen
))
1850 die(_("path '%s' is in the index, but not at stage %d\n"
1851 "hint: Did you mean ':%d:%s'?"),
1853 ce_stage(ce
), filename
);
1856 /* Confusion between relative and absolute filenames? */
1857 strbuf_addstr(&fullname
, prefix
);
1858 strbuf_addstr(&fullname
, filename
);
1859 pos
= index_name_pos(istate
, fullname
.buf
, fullname
.len
);
1862 if (pos
< istate
->cache_nr
) {
1863 ce
= istate
->cache
[pos
];
1864 if (!S_ISSPARSEDIR(ce
->ce_mode
) &&
1865 ce_namelen(ce
) == fullname
.len
&&
1866 !memcmp(ce
->name
, fullname
.buf
, fullname
.len
))
1867 die(_("path '%s' is in the index, but not '%s'\n"
1868 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
1869 fullname
.buf
, filename
,
1870 ce_stage(ce
), fullname
.buf
,
1871 ce_stage(ce
), filename
);
1874 if (repo_file_exists(r
, filename
))
1875 die(_("path '%s' exists on disk, but not in the index"), filename
);
1876 if (is_missing_file_error(errno
))
1877 die(_("path '%s' does not exist (neither on disk nor in the index)"),
1880 strbuf_release(&fullname
);
1884 static char *resolve_relative_path(struct repository
*r
, const char *rel
)
1886 if (!starts_with(rel
, "./") && !starts_with(rel
, "../"))
1889 if (r
!= the_repository
|| !is_inside_work_tree())
1890 die(_("relative path syntax can't be used outside working tree"));
1892 /* die() inside prefix_path() if resolved path is outside worktree */
1893 return prefix_path(startup_info
->prefix
,
1894 startup_info
->prefix
? strlen(startup_info
->prefix
) : 0,
1898 static int reject_tree_in_index(struct repository
*repo
,
1900 const struct cache_entry
*ce
,
1905 if (!S_ISSPARSEDIR(ce
->ce_mode
))
1908 diagnose_invalid_index_path(repo
, stage
, prefix
, cp
);
1912 static enum get_oid_result
get_oid_with_context_1(struct repository
*repo
,
1916 struct object_id
*oid
,
1917 struct object_context
*oc
)
1919 int ret
, bracket_depth
;
1920 int namelen
= strlen(name
);
1922 int only_to_die
= flags
& GET_OID_ONLY_TO_DIE
;
1924 memset(oc
, 0, sizeof(*oc
));
1925 oc
->mode
= S_IFINVALID
;
1926 strbuf_init(&oc
->symlink_path
, 0);
1927 ret
= get_oid_1(repo
, name
, namelen
, oid
, flags
);
1928 if (!ret
&& flags
& GET_OID_REQUIRE_PATH
)
1929 die(_("<object>:<path> required, only <object> '%s' given"),
1934 * tree:path --> object name of path in tree
1935 * :path -> object name of absolute path in index
1936 * :./path -> object name of path relative to cwd in index
1937 * :[0-3]:path -> object name of path in index at stage
1938 * :/foo -> recent commit matching foo
1940 if (name
[0] == ':') {
1942 const struct cache_entry
*ce
;
1943 char *new_path
= NULL
;
1945 if (!only_to_die
&& namelen
> 2 && name
[1] == '/') {
1946 struct handle_one_ref_cb cb
;
1947 struct commit_list
*list
= NULL
;
1951 refs_for_each_ref(get_main_ref_store(repo
), handle_one_ref
, &cb
);
1952 refs_head_ref(get_main_ref_store(repo
), handle_one_ref
, &cb
);
1953 commit_list_sort_by_date(&list
);
1954 return get_oid_oneline(repo
, name
+ 2, oid
, list
);
1958 name
[1] < '0' || '3' < name
[1])
1961 stage
= name
[1] - '0';
1964 new_path
= resolve_relative_path(repo
, cp
);
1966 namelen
= namelen
- (cp
- name
);
1969 namelen
= strlen(cp
);
1972 if (flags
& GET_OID_RECORD_PATH
)
1973 oc
->path
= xstrdup(cp
);
1975 if (!repo
->index
|| !repo
->index
->cache
)
1976 repo_read_index(repo
);
1977 pos
= index_name_pos(repo
->index
, cp
, namelen
);
1980 while (pos
< repo
->index
->cache_nr
) {
1981 ce
= repo
->index
->cache
[pos
];
1982 if (ce_namelen(ce
) != namelen
||
1983 memcmp(ce
->name
, cp
, namelen
))
1985 if (ce_stage(ce
) == stage
) {
1987 if (reject_tree_in_index(repo
, only_to_die
, ce
,
1990 oidcpy(oid
, &ce
->oid
);
1991 oc
->mode
= ce
->ce_mode
;
1996 if (only_to_die
&& name
[1] && name
[1] != '/')
1997 diagnose_invalid_index_path(repo
, stage
, prefix
, cp
);
2001 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
2004 else if (bracket_depth
&& *cp
== '}')
2006 else if (!bracket_depth
&& *cp
== ':')
2010 struct object_id tree_oid
;
2011 int len
= cp
- name
;
2012 unsigned sub_flags
= flags
;
2014 sub_flags
&= ~GET_OID_DISAMBIGUATORS
;
2015 sub_flags
|= GET_OID_TREEISH
;
2017 if (!get_oid_1(repo
, name
, len
, &tree_oid
, sub_flags
)) {
2018 const char *filename
= cp
+1;
2019 char *new_filename
= NULL
;
2021 new_filename
= resolve_relative_path(repo
, filename
);
2023 filename
= new_filename
;
2024 if (flags
& GET_OID_FOLLOW_SYMLINKS
) {
2025 ret
= get_tree_entry_follow_symlinks(repo
, &tree_oid
,
2026 filename
, oid
, &oc
->symlink_path
,
2029 ret
= get_tree_entry(repo
, &tree_oid
, filename
, oid
,
2031 if (ret
&& only_to_die
) {
2032 diagnose_invalid_oid_path(repo
, prefix
,
2038 if (flags
& GET_OID_RECORD_PATH
)
2039 oc
->path
= xstrdup(filename
);
2045 die(_("invalid object name '%.*s'."), len
, name
);
2052 * Call this function when you know "name" given by the end user must
2053 * name an object but it doesn't; the function _may_ die with a better
2054 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
2055 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
2056 * you have a chance to diagnose the error further.
2058 void maybe_die_on_misspelt_object_name(struct repository
*r
,
2062 struct object_context oc
;
2063 struct object_id oid
;
2064 get_oid_with_context_1(r
, name
, GET_OID_ONLY_TO_DIE
| GET_OID_QUIETLY
,
2068 enum get_oid_result
get_oid_with_context(struct repository
*repo
,
2071 struct object_id
*oid
,
2072 struct object_context
*oc
)
2074 if (flags
& GET_OID_FOLLOW_SYMLINKS
&& flags
& GET_OID_ONLY_TO_DIE
)
2075 BUG("incompatible flags for get_oid_with_context");
2076 return get_oid_with_context_1(repo
, str
, flags
, NULL
, oid
, oc
);