3 #include "environment.h"
10 #include "tree-walk.h"
14 #include "oid-array.h"
16 #include "object-store.h"
17 #include "repository.h"
18 #include "submodule.h"
20 #include "commit-reach.h"
23 static int get_oid_oneline(struct repository
*r
, const char *, struct object_id
*, struct commit_list
*);
25 typedef int (*disambiguate_hint_fn
)(struct repository
*, const struct object_id
*, void *);
27 struct disambiguate_state
{
28 int len
; /* length of prefix in hex chars */
29 char hex_pfx
[GIT_MAX_HEXSZ
+ 1];
30 struct object_id bin_pfx
;
32 struct repository
*repo
;
33 disambiguate_hint_fn fn
;
35 struct object_id candidate
;
36 unsigned candidate_exists
:1;
37 unsigned candidate_checked
:1;
38 unsigned candidate_ok
:1;
39 unsigned disambiguate_fn_used
:1;
41 unsigned always_call_fn
:1;
44 static void update_candidates(struct disambiguate_state
*ds
, const struct object_id
*current
)
46 if (ds
->always_call_fn
) {
47 ds
->ambiguous
= ds
->fn(ds
->repo
, current
, ds
->cb_data
) ? 1 : 0;
50 if (!ds
->candidate_exists
) {
51 /* this is the first candidate */
52 oidcpy(&ds
->candidate
, current
);
53 ds
->candidate_exists
= 1;
55 } else if (oideq(&ds
->candidate
, current
)) {
56 /* the same as what we already have seen */
61 /* cannot disambiguate between ds->candidate and current */
66 if (!ds
->candidate_checked
) {
67 ds
->candidate_ok
= ds
->fn(ds
->repo
, &ds
->candidate
, ds
->cb_data
);
68 ds
->disambiguate_fn_used
= 1;
69 ds
->candidate_checked
= 1;
72 if (!ds
->candidate_ok
) {
73 /* discard the candidate; we know it does not satisfy fn */
74 oidcpy(&ds
->candidate
, current
);
75 ds
->candidate_checked
= 0;
79 /* if we reach this point, we know ds->candidate satisfies fn */
80 if (ds
->fn(ds
->repo
, current
, ds
->cb_data
)) {
82 * if both current and candidate satisfy fn, we cannot
89 /* otherwise, current can be discarded and candidate is still good */
92 static int match_hash(unsigned, const unsigned char *, const unsigned char *);
94 static enum cb_next
match_prefix(const struct object_id
*oid
, void *arg
)
96 struct disambiguate_state
*ds
= arg
;
97 /* no need to call match_hash, oidtree_each did prefix match */
98 update_candidates(ds
, oid
);
99 return ds
->ambiguous
? CB_BREAK
: CB_CONTINUE
;
102 static void find_short_object_filename(struct disambiguate_state
*ds
)
104 struct object_directory
*odb
;
106 for (odb
= ds
->repo
->objects
->odb
; odb
&& !ds
->ambiguous
; odb
= odb
->next
)
107 oidtree_each(odb_loose_cache(odb
, &ds
->bin_pfx
),
108 &ds
->bin_pfx
, ds
->len
, match_prefix
, ds
);
111 static int match_hash(unsigned len
, const unsigned char *a
, const unsigned char *b
)
121 if ((*a
^ *b
) & 0xf0)
126 static void unique_in_midx(struct multi_pack_index
*m
,
127 struct disambiguate_state
*ds
)
129 uint32_t num
, i
, first
= 0;
130 const struct object_id
*current
= NULL
;
131 num
= m
->num_objects
;
136 bsearch_midx(&ds
->bin_pfx
, m
, &first
);
139 * At this point, "first" is the location of the lowest object
140 * with an object name that could match "bin_pfx". See if we have
141 * 0, 1 or more objects that actually match(es).
143 for (i
= first
; i
< num
&& !ds
->ambiguous
; i
++) {
144 struct object_id oid
;
145 current
= nth_midxed_object_oid(&oid
, m
, i
);
146 if (!match_hash(ds
->len
, ds
->bin_pfx
.hash
, current
->hash
))
148 update_candidates(ds
, current
);
152 static void unique_in_pack(struct packed_git
*p
,
153 struct disambiguate_state
*ds
)
155 uint32_t num
, i
, first
= 0;
157 if (p
->multi_pack_index
)
160 if (open_pack_index(p
) || !p
->num_objects
)
163 num
= p
->num_objects
;
164 bsearch_pack(&ds
->bin_pfx
, p
, &first
);
167 * At this point, "first" is the location of the lowest object
168 * with an object name that could match "bin_pfx". See if we have
169 * 0, 1 or more objects that actually match(es).
171 for (i
= first
; i
< num
&& !ds
->ambiguous
; i
++) {
172 struct object_id oid
;
173 nth_packed_object_id(&oid
, p
, i
);
174 if (!match_hash(ds
->len
, ds
->bin_pfx
.hash
, oid
.hash
))
176 update_candidates(ds
, &oid
);
180 static void find_short_packed_object(struct disambiguate_state
*ds
)
182 struct multi_pack_index
*m
;
183 struct packed_git
*p
;
185 for (m
= get_multi_pack_index(ds
->repo
); m
&& !ds
->ambiguous
;
187 unique_in_midx(m
, ds
);
188 for (p
= get_packed_git(ds
->repo
); p
&& !ds
->ambiguous
;
190 unique_in_pack(p
, ds
);
193 static int finish_object_disambiguation(struct disambiguate_state
*ds
,
194 struct object_id
*oid
)
197 return SHORT_NAME_AMBIGUOUS
;
199 if (!ds
->candidate_exists
)
200 return MISSING_OBJECT
;
202 if (!ds
->candidate_checked
)
204 * If this is the only candidate, there is no point
205 * calling the disambiguation hint callback.
207 * On the other hand, if the current candidate
208 * replaced an earlier candidate that did _not_ pass
209 * the disambiguation hint callback, then we do have
210 * more than one objects that match the short name
211 * given, so we should make sure this one matches;
212 * otherwise, if we discovered this one and the one
213 * that we previously discarded in the reverse order,
214 * we would end up showing different results in the
217 ds
->candidate_ok
= (!ds
->disambiguate_fn_used
||
218 ds
->fn(ds
->repo
, &ds
->candidate
, ds
->cb_data
));
220 if (!ds
->candidate_ok
)
221 return SHORT_NAME_AMBIGUOUS
;
223 oidcpy(oid
, &ds
->candidate
);
227 static int disambiguate_commit_only(struct repository
*r
,
228 const struct object_id
*oid
,
229 void *cb_data UNUSED
)
231 int kind
= oid_object_info(r
, oid
, NULL
);
232 return kind
== OBJ_COMMIT
;
235 static int disambiguate_committish_only(struct repository
*r
,
236 const struct object_id
*oid
,
237 void *cb_data UNUSED
)
242 kind
= oid_object_info(r
, oid
, NULL
);
243 if (kind
== OBJ_COMMIT
)
248 /* We need to do this the hard way... */
249 obj
= deref_tag(r
, parse_object(r
, oid
), NULL
, 0);
250 if (obj
&& obj
->type
== OBJ_COMMIT
)
255 static int disambiguate_tree_only(struct repository
*r
,
256 const struct object_id
*oid
,
257 void *cb_data UNUSED
)
259 int kind
= oid_object_info(r
, oid
, NULL
);
260 return kind
== OBJ_TREE
;
263 static int disambiguate_treeish_only(struct repository
*r
,
264 const struct object_id
*oid
,
265 void *cb_data UNUSED
)
270 kind
= oid_object_info(r
, oid
, NULL
);
271 if (kind
== OBJ_TREE
|| kind
== OBJ_COMMIT
)
276 /* We need to do this the hard way... */
277 obj
= deref_tag(r
, parse_object(r
, oid
), NULL
, 0);
278 if (obj
&& (obj
->type
== OBJ_TREE
|| obj
->type
== OBJ_COMMIT
))
283 static int disambiguate_blob_only(struct repository
*r
,
284 const struct object_id
*oid
,
285 void *cb_data UNUSED
)
287 int kind
= oid_object_info(r
, oid
, NULL
);
288 return kind
== OBJ_BLOB
;
291 static disambiguate_hint_fn default_disambiguate_hint
;
293 int set_disambiguate_hint_config(const char *var
, const char *value
)
295 static const struct {
297 disambiguate_hint_fn fn
;
300 { "commit", disambiguate_commit_only
},
301 { "committish", disambiguate_committish_only
},
302 { "tree", disambiguate_tree_only
},
303 { "treeish", disambiguate_treeish_only
},
304 { "blob", disambiguate_blob_only
}
309 return config_error_nonbool(var
);
311 for (i
= 0; i
< ARRAY_SIZE(hints
); i
++) {
312 if (!strcasecmp(value
, hints
[i
].name
)) {
313 default_disambiguate_hint
= hints
[i
].fn
;
318 return error("unknown hint type for '%s': %s", var
, value
);
321 static int init_object_disambiguation(struct repository
*r
,
322 const char *name
, int len
,
323 struct disambiguate_state
*ds
)
327 if (len
< MINIMUM_ABBREV
|| len
> the_hash_algo
->hexsz
)
330 memset(ds
, 0, sizeof(*ds
));
332 for (i
= 0; i
< len
;i
++) {
333 unsigned char c
= name
[i
];
335 if (c
>= '0' && c
<= '9')
337 else if (c
>= 'a' && c
<= 'f')
339 else if (c
>= 'A' && c
<='F') {
348 ds
->bin_pfx
.hash
[i
>> 1] |= val
;
352 ds
->hex_pfx
[len
] = '\0';
358 struct ambiguous_output
{
359 const struct disambiguate_state
*ds
;
360 struct strbuf advice
;
364 static int show_ambiguous_object(const struct object_id
*oid
, void *data
)
366 struct ambiguous_output
*state
= data
;
367 const struct disambiguate_state
*ds
= state
->ds
;
368 struct strbuf
*advice
= &state
->advice
;
369 struct strbuf
*sb
= &state
->sb
;
373 if (ds
->fn
&& !ds
->fn(ds
->repo
, oid
, ds
->cb_data
))
376 hash
= repo_find_unique_abbrev(ds
->repo
, oid
, DEFAULT_ABBREV
);
377 type
= oid_object_info(ds
->repo
, oid
, NULL
);
381 * TRANSLATORS: This is a line of ambiguous object
382 * output shown when we cannot look up or parse the
383 * object in question. E.g. "deadbeef [bad object]".
385 strbuf_addf(sb
, _("%s [bad object]"), hash
);
389 assert(type
== OBJ_TREE
|| type
== OBJ_COMMIT
||
390 type
== OBJ_BLOB
|| type
== OBJ_TAG
);
392 if (type
== OBJ_COMMIT
) {
393 struct strbuf date
= STRBUF_INIT
;
394 struct strbuf msg
= STRBUF_INIT
;
395 struct commit
*commit
= lookup_commit(ds
->repo
, oid
);
398 struct pretty_print_context pp
= {0};
399 pp
.date_mode
.type
= DATE_SHORT
;
400 format_commit_message(commit
, "%ad", &date
, &pp
);
401 format_commit_message(commit
, "%s", &msg
, &pp
);
405 * TRANSLATORS: This is a line of ambiguous commit
406 * object output. E.g.:
408 * "deadbeef commit 2021-01-01 - Some Commit Message"
410 strbuf_addf(sb
, _("%s commit %s - %s"), hash
, date
.buf
,
413 strbuf_release(&date
);
414 strbuf_release(&msg
);
415 } else if (type
== OBJ_TAG
) {
416 struct tag
*tag
= lookup_tag(ds
->repo
, oid
);
418 if (!parse_tag(tag
) && tag
->tag
) {
420 * TRANSLATORS: This is a line of ambiguous
421 * tag object output. E.g.:
423 * "deadbeef tag 2022-01-01 - Some Tag Message"
425 * The second argument is the YYYY-MM-DD found
428 * The third argument is the "tag" string
431 strbuf_addf(sb
, _("%s tag %s - %s"), hash
,
432 show_date(tag
->date
, 0, DATE_MODE(SHORT
)),
436 * TRANSLATORS: This is a line of ambiguous
437 * tag object output where we couldn't parse
438 * the tag itself. E.g.:
440 * "deadbeef [bad tag, could not parse it]"
442 strbuf_addf(sb
, _("%s [bad tag, could not parse it]"),
445 } else if (type
== OBJ_TREE
) {
447 * TRANSLATORS: This is a line of ambiguous <type>
448 * object output. E.g. "deadbeef tree".
450 strbuf_addf(sb
, _("%s tree"), hash
);
451 } else if (type
== OBJ_BLOB
) {
453 * TRANSLATORS: This is a line of ambiguous <type>
454 * object output. E.g. "deadbeef blob".
456 strbuf_addf(sb
, _("%s blob"), hash
);
462 * TRANSLATORS: This is line item of ambiguous object output
463 * from describe_ambiguous_object() above. For RTL languages
464 * you'll probably want to swap the "%s" and leading " " space
467 strbuf_addf(advice
, _(" %s\n"), sb
->buf
);
473 static int collect_ambiguous(const struct object_id
*oid
, void *data
)
475 oid_array_append(data
, oid
);
479 static int repo_collect_ambiguous(struct repository
*r UNUSED
,
480 const struct object_id
*oid
,
483 return collect_ambiguous(oid
, data
);
486 static int sort_ambiguous(const void *a
, const void *b
, void *ctx
)
488 struct repository
*sort_ambiguous_repo
= ctx
;
489 int a_type
= oid_object_info(sort_ambiguous_repo
, a
, NULL
);
490 int b_type
= oid_object_info(sort_ambiguous_repo
, b
, NULL
);
495 * Sorts by hash within the same object type, just as
496 * oid_array_for_each_unique() would do.
498 if (a_type
== b_type
)
502 * Between object types show tags, then commits, and finally
505 * The object_type enum is commit, tree, blob, tag, but we
506 * want tag, commit, tree blob. Cleverly (perhaps too
507 * cleverly) do that with modulus, since the enum assigns 1 to
508 * commit, so tag becomes 0.
510 a_type_sort
= a_type
% 4;
511 b_type_sort
= b_type
% 4;
512 return a_type_sort
> b_type_sort
? 1 : -1;
515 static void sort_ambiguous_oid_array(struct repository
*r
, struct oid_array
*a
)
517 QSORT_S(a
->oid
, a
->nr
, sort_ambiguous
, r
);
520 static enum get_oid_result
get_short_oid(struct repository
*r
,
521 const char *name
, int len
,
522 struct object_id
*oid
,
526 struct disambiguate_state ds
;
527 int quietly
= !!(flags
& GET_OID_QUIETLY
);
529 if (init_object_disambiguation(r
, name
, len
, &ds
) < 0)
532 if (HAS_MULTI_BITS(flags
& GET_OID_DISAMBIGUATORS
))
533 BUG("multiple get_short_oid disambiguator flags");
535 if (flags
& GET_OID_COMMIT
)
536 ds
.fn
= disambiguate_commit_only
;
537 else if (flags
& GET_OID_COMMITTISH
)
538 ds
.fn
= disambiguate_committish_only
;
539 else if (flags
& GET_OID_TREE
)
540 ds
.fn
= disambiguate_tree_only
;
541 else if (flags
& GET_OID_TREEISH
)
542 ds
.fn
= disambiguate_treeish_only
;
543 else if (flags
& GET_OID_BLOB
)
544 ds
.fn
= disambiguate_blob_only
;
546 ds
.fn
= default_disambiguate_hint
;
548 find_short_object_filename(&ds
);
549 find_short_packed_object(&ds
);
550 status
= finish_object_disambiguation(&ds
, oid
);
553 * If we didn't find it, do the usual reprepare() slow-path,
554 * since the object may have recently been added to the repository
555 * or migrated from loose to packed.
557 if (status
== MISSING_OBJECT
) {
558 reprepare_packed_git(r
);
559 find_short_object_filename(&ds
);
560 find_short_packed_object(&ds
);
561 status
= finish_object_disambiguation(&ds
, oid
);
564 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
)) {
565 struct oid_array collect
= OID_ARRAY_INIT
;
566 struct ambiguous_output out
= {
569 .advice
= STRBUF_INIT
,
572 error(_("short object ID %s is ambiguous"), ds
.hex_pfx
);
575 * We may still have ambiguity if we simply saw a series of
576 * candidates that did not satisfy our hint function. In
577 * that case, we still want to show them, so disable the hint
583 repo_for_each_abbrev(r
, ds
.hex_pfx
, collect_ambiguous
, &collect
);
584 sort_ambiguous_oid_array(r
, &collect
);
586 if (oid_array_for_each(&collect
, show_ambiguous_object
, &out
))
587 BUG("show_ambiguous_object shouldn't return non-zero");
590 * TRANSLATORS: The argument is the list of ambiguous
591 * objects composed in show_ambiguous_object(). See
592 * its "TRANSLATORS" comments for details.
594 advise(_("The candidates are:\n%s"), out
.advice
.buf
);
596 oid_array_clear(&collect
);
597 strbuf_release(&out
.advice
);
598 strbuf_release(&out
.sb
);
604 int repo_for_each_abbrev(struct repository
*r
, const char *prefix
,
605 each_abbrev_fn fn
, void *cb_data
)
607 struct oid_array collect
= OID_ARRAY_INIT
;
608 struct disambiguate_state ds
;
611 if (init_object_disambiguation(r
, prefix
, strlen(prefix
), &ds
) < 0)
614 ds
.always_call_fn
= 1;
615 ds
.fn
= repo_collect_ambiguous
;
616 ds
.cb_data
= &collect
;
617 find_short_object_filename(&ds
);
618 find_short_packed_object(&ds
);
620 ret
= oid_array_for_each_unique(&collect
, fn
, cb_data
);
621 oid_array_clear(&collect
);
626 * Return the slot of the most-significant bit set in "val". There are various
627 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
628 * probably not a big deal here.
630 static unsigned msb(unsigned long val
)
638 struct min_abbrev_data
{
639 unsigned int init_len
;
640 unsigned int cur_len
;
642 struct repository
*repo
;
643 const struct object_id
*oid
;
646 static inline char get_hex_char_from_oid(const struct object_id
*oid
,
649 static const char hex
[] = "0123456789abcdef";
652 return hex
[oid
->hash
[pos
>> 1] >> 4];
654 return hex
[oid
->hash
[pos
>> 1] & 0xf];
657 static int extend_abbrev_len(const struct object_id
*oid
, void *cb_data
)
659 struct min_abbrev_data
*mad
= cb_data
;
661 unsigned int i
= mad
->init_len
;
662 while (mad
->hex
[i
] && mad
->hex
[i
] == get_hex_char_from_oid(oid
, i
))
665 if (i
< GIT_MAX_RAWSZ
&& i
>= mad
->cur_len
)
666 mad
->cur_len
= i
+ 1;
671 static int repo_extend_abbrev_len(struct repository
*r UNUSED
,
672 const struct object_id
*oid
,
675 return extend_abbrev_len(oid
, cb_data
);
678 static void find_abbrev_len_for_midx(struct multi_pack_index
*m
,
679 struct min_abbrev_data
*mad
)
682 uint32_t num
, first
= 0;
683 struct object_id oid
;
684 const struct object_id
*mad_oid
;
689 num
= m
->num_objects
;
691 match
= bsearch_midx(mad_oid
, m
, &first
);
694 * first is now the position in the packfile where we would insert
695 * mad->hash if it does not exist (or the position of mad->hash if
696 * it does exist). Hence, we consider a maximum of two objects
697 * nearby for the abbreviation length.
701 if (nth_midxed_object_oid(&oid
, m
, first
))
702 extend_abbrev_len(&oid
, mad
);
703 } else if (first
< num
- 1) {
704 if (nth_midxed_object_oid(&oid
, m
, first
+ 1))
705 extend_abbrev_len(&oid
, mad
);
708 if (nth_midxed_object_oid(&oid
, m
, first
- 1))
709 extend_abbrev_len(&oid
, mad
);
711 mad
->init_len
= mad
->cur_len
;
714 static void find_abbrev_len_for_pack(struct packed_git
*p
,
715 struct min_abbrev_data
*mad
)
718 uint32_t num
, first
= 0;
719 struct object_id oid
;
720 const struct object_id
*mad_oid
;
722 if (p
->multi_pack_index
)
725 if (open_pack_index(p
) || !p
->num_objects
)
728 num
= p
->num_objects
;
730 match
= bsearch_pack(mad_oid
, p
, &first
);
733 * first is now the position in the packfile where we would insert
734 * mad->hash if it does not exist (or the position of mad->hash if
735 * it does exist). Hence, we consider a maximum of two objects
736 * nearby for the abbreviation length.
740 if (!nth_packed_object_id(&oid
, p
, first
))
741 extend_abbrev_len(&oid
, mad
);
742 } else if (first
< num
- 1) {
743 if (!nth_packed_object_id(&oid
, p
, first
+ 1))
744 extend_abbrev_len(&oid
, mad
);
747 if (!nth_packed_object_id(&oid
, p
, first
- 1))
748 extend_abbrev_len(&oid
, mad
);
750 mad
->init_len
= mad
->cur_len
;
753 static void find_abbrev_len_packed(struct min_abbrev_data
*mad
)
755 struct multi_pack_index
*m
;
756 struct packed_git
*p
;
758 for (m
= get_multi_pack_index(mad
->repo
); m
; m
= m
->next
)
759 find_abbrev_len_for_midx(m
, mad
);
760 for (p
= get_packed_git(mad
->repo
); p
; p
= p
->next
)
761 find_abbrev_len_for_pack(p
, mad
);
764 int repo_find_unique_abbrev_r(struct repository
*r
, char *hex
,
765 const struct object_id
*oid
, int len
)
767 struct disambiguate_state ds
;
768 struct min_abbrev_data mad
;
769 struct object_id oid_ret
;
770 const unsigned hexsz
= r
->hash_algo
->hexsz
;
773 unsigned long count
= repo_approximate_object_count(r
);
775 * Add one because the MSB only tells us the highest bit set,
776 * not including the value of all the _other_ bits (so "15"
777 * is only one off of 2^4, but the MSB is the 3rd bit.
779 len
= msb(count
) + 1;
781 * We now know we have on the order of 2^len objects, which
782 * expects a collision at 2^(len/2). But we also care about hex
783 * chars, not bits, and there are 4 bits per hex. So all
784 * together we need to divide by 2 and round up.
786 len
= DIV_ROUND_UP(len
, 2);
788 * For very small repos, we stick with our regular fallback.
790 if (len
< FALLBACK_DEFAULT_ABBREV
)
791 len
= FALLBACK_DEFAULT_ABBREV
;
794 oid_to_hex_r(hex
, oid
);
795 if (len
== hexsz
|| !len
)
804 find_abbrev_len_packed(&mad
);
806 if (init_object_disambiguation(r
, hex
, mad
.cur_len
, &ds
) < 0)
809 ds
.fn
= repo_extend_abbrev_len
;
810 ds
.always_call_fn
= 1;
811 ds
.cb_data
= (void *)&mad
;
813 find_short_object_filename(&ds
);
814 (void)finish_object_disambiguation(&ds
, &oid_ret
);
816 hex
[mad
.cur_len
] = 0;
820 const char *repo_find_unique_abbrev(struct repository
*r
,
821 const struct object_id
*oid
,
825 static char hexbuffer
[4][GIT_MAX_HEXSZ
+ 1];
826 char *hex
= hexbuffer
[bufno
];
827 bufno
= (bufno
+ 1) % ARRAY_SIZE(hexbuffer
);
828 repo_find_unique_abbrev_r(r
, hex
, oid
, len
);
832 static int ambiguous_path(const char *path
, int len
)
837 for (cnt
= 0; cnt
< len
; cnt
++) {
857 static inline int at_mark(const char *string
, int len
,
858 const char **suffix
, int nr
)
862 for (i
= 0; i
< nr
; i
++) {
863 int suffix_len
= strlen(suffix
[i
]);
864 if (suffix_len
<= len
865 && !strncasecmp(string
, suffix
[i
], suffix_len
))
871 static inline int upstream_mark(const char *string
, int len
)
873 const char *suffix
[] = { "@{upstream}", "@{u}" };
874 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
877 static inline int push_mark(const char *string
, int len
)
879 const char *suffix
[] = { "@{push}" };
880 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
883 static enum get_oid_result
get_oid_1(struct repository
*r
, const char *name
, int len
, struct object_id
*oid
, unsigned lookup_flags
);
884 static int interpret_nth_prior_checkout(struct repository
*r
, const char *name
, int namelen
, struct strbuf
*buf
);
886 static int get_oid_basic(struct repository
*r
, const char *str
, int len
,
887 struct object_id
*oid
, unsigned int flags
)
889 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
890 static const char *object_name_msg
= N_(
891 "Git normally never creates a ref that ends with 40 hex characters\n"
892 "because it will be ignored when you just specify 40-hex. These refs\n"
893 "may be created by mistake. For example,\n"
895 " git switch -c $br $(git rev-parse ...)\n"
897 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
898 "examine these refs and maybe delete them. Turn this message off by\n"
899 "running \"git config advice.objectNameWarning false\"");
900 struct object_id tmp_oid
;
901 char *real_ref
= NULL
;
903 int at
, reflog_len
, nth_prior
= 0;
905 if (len
== r
->hash_algo
->hexsz
&& !get_oid_hex(str
, oid
)) {
906 if (warn_ambiguous_refs
&& warn_on_object_refname_ambiguity
) {
907 refs_found
= repo_dwim_ref(r
, str
, len
, &tmp_oid
, &real_ref
, 0);
908 if (refs_found
> 0) {
909 warning(warn_msg
, len
, str
);
910 if (advice_enabled(ADVICE_OBJECT_NAME_WARNING
))
911 fprintf(stderr
, "%s\n", _(object_name_msg
));
918 /* basic@{time or number or -number} format to query ref-log */
920 if (len
&& str
[len
-1] == '}') {
921 for (at
= len
-4; at
>= 0; at
--) {
922 if (str
[at
] == '@' && str
[at
+1] == '{') {
923 if (str
[at
+2] == '-') {
925 /* @{-N} not at start */
930 if (!upstream_mark(str
+ at
, len
- at
) &&
931 !push_mark(str
+ at
, len
- at
)) {
932 reflog_len
= (len
-1) - (at
+2);
940 /* Accept only unambiguous ref paths. */
941 if (len
&& ambiguous_path(str
, len
))
945 struct strbuf buf
= STRBUF_INIT
;
948 if (interpret_nth_prior_checkout(r
, str
, len
, &buf
) > 0) {
949 detached
= (buf
.len
== r
->hash_algo
->hexsz
&& !get_oid_hex(buf
.buf
, oid
));
950 strbuf_release(&buf
);
956 if (!len
&& reflog_len
)
957 /* allow "@{...}" to mean the current branch reflog */
958 refs_found
= repo_dwim_ref(r
, "HEAD", 4, oid
, &real_ref
, 0);
960 refs_found
= repo_dwim_log(r
, str
, len
, oid
, &real_ref
);
962 refs_found
= repo_dwim_ref(r
, str
, len
, oid
, &real_ref
, 0);
967 if (warn_ambiguous_refs
&& !(flags
& GET_OID_QUIETLY
) &&
969 !get_short_oid(r
, str
, len
, &tmp_oid
, GET_OID_QUIETLY
)))
970 warning(warn_msg
, len
, str
);
978 /* Is it asking for N-th entry, or approxidate? */
979 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
980 char ch
= str
[at
+2+i
];
981 if ('0' <= ch
&& ch
<= '9')
982 nth
= nth
* 10 + ch
- '0';
986 if (100000000 <= nth
) {
993 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
994 at_time
= approxidate_careful(tmp
, &errors
);
1001 if (read_ref_at(get_main_ref_store(r
),
1002 real_ref
, flags
, at_time
, nth
, oid
, NULL
,
1003 &co_time
, &co_tz
, &co_cnt
)) {
1005 if (!skip_prefix(real_ref
, "refs/heads/", &str
))
1010 if (!(flags
& GET_OID_QUIETLY
)) {
1011 warning(_("log for '%.*s' only goes back to %s"),
1013 show_date(co_time
, co_tz
, DATE_MODE(RFC2822
)));
1016 if (flags
& GET_OID_QUIETLY
) {
1019 die(_("log for '%.*s' only has %d entries"),
1029 static enum get_oid_result
get_parent(struct repository
*r
,
1030 const char *name
, int len
,
1031 struct object_id
*result
, int idx
)
1033 struct object_id oid
;
1034 enum get_oid_result ret
= get_oid_1(r
, name
, len
, &oid
,
1035 GET_OID_COMMITTISH
);
1036 struct commit
*commit
;
1037 struct commit_list
*p
;
1041 commit
= lookup_commit_reference(r
, &oid
);
1042 if (parse_commit(commit
))
1043 return MISSING_OBJECT
;
1045 oidcpy(result
, &commit
->object
.oid
);
1048 p
= commit
->parents
;
1051 oidcpy(result
, &p
->item
->object
.oid
);
1056 return MISSING_OBJECT
;
1059 static enum get_oid_result
get_nth_ancestor(struct repository
*r
,
1060 const char *name
, int len
,
1061 struct object_id
*result
,
1064 struct object_id oid
;
1065 struct commit
*commit
;
1068 ret
= get_oid_1(r
, name
, len
, &oid
, GET_OID_COMMITTISH
);
1071 commit
= lookup_commit_reference(r
, &oid
);
1073 return MISSING_OBJECT
;
1075 while (generation
--) {
1076 if (parse_commit(commit
) || !commit
->parents
)
1077 return MISSING_OBJECT
;
1078 commit
= commit
->parents
->item
;
1080 oidcpy(result
, &commit
->object
.oid
);
1084 struct object
*repo_peel_to_type(struct repository
*r
, const char *name
, int namelen
,
1085 struct object
*o
, enum object_type expected_type
)
1087 if (name
&& !namelen
)
1088 namelen
= strlen(name
);
1090 if (!o
|| (!o
->parsed
&& !parse_object(r
, &o
->oid
)))
1092 if (expected_type
== OBJ_ANY
|| o
->type
== expected_type
)
1094 if (o
->type
== OBJ_TAG
)
1095 o
= ((struct tag
*) o
)->tagged
;
1096 else if (o
->type
== OBJ_COMMIT
)
1097 o
= &(repo_get_commit_tree(r
, ((struct commit
*)o
))->object
);
1100 error("%.*s: expected %s type, but the object "
1101 "dereferences to %s type",
1102 namelen
, name
, type_name(expected_type
),
1103 type_name(o
->type
));
1109 static int peel_onion(struct repository
*r
, const char *name
, int len
,
1110 struct object_id
*oid
, unsigned lookup_flags
)
1112 struct object_id outer
;
1114 unsigned int expected_type
= 0;
1118 * "ref^{type}" dereferences ref repeatedly until you cannot
1119 * dereference anymore, or you get an object of given type,
1120 * whichever comes first. "ref^{}" means just dereference
1121 * tags until you get a non-tag. "ref^0" is a shorthand for
1122 * "ref^{commit}". "commit^{tree}" could be used to find the
1123 * top-level tree of the given commit.
1125 if (len
< 4 || name
[len
-1] != '}')
1128 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
1130 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
1136 sp
++; /* beginning of type name, or closing brace for empty */
1137 if (starts_with(sp
, "commit}"))
1138 expected_type
= OBJ_COMMIT
;
1139 else if (starts_with(sp
, "tag}"))
1140 expected_type
= OBJ_TAG
;
1141 else if (starts_with(sp
, "tree}"))
1142 expected_type
= OBJ_TREE
;
1143 else if (starts_with(sp
, "blob}"))
1144 expected_type
= OBJ_BLOB
;
1145 else if (starts_with(sp
, "object}"))
1146 expected_type
= OBJ_ANY
;
1147 else if (sp
[0] == '}')
1148 expected_type
= OBJ_NONE
;
1149 else if (sp
[0] == '/')
1150 expected_type
= OBJ_COMMIT
;
1154 lookup_flags
&= ~GET_OID_DISAMBIGUATORS
;
1155 if (expected_type
== OBJ_COMMIT
)
1156 lookup_flags
|= GET_OID_COMMITTISH
;
1157 else if (expected_type
== OBJ_TREE
)
1158 lookup_flags
|= GET_OID_TREEISH
;
1160 if (get_oid_1(r
, name
, sp
- name
- 2, &outer
, lookup_flags
))
1163 o
= parse_object(r
, &outer
);
1166 if (!expected_type
) {
1167 o
= deref_tag(r
, o
, name
, sp
- name
- 2);
1168 if (!o
|| (!o
->parsed
&& !parse_object(r
, &o
->oid
)))
1170 oidcpy(oid
, &o
->oid
);
1175 * At this point, the syntax look correct, so
1176 * if we do not get the needed object, we should
1179 o
= repo_peel_to_type(r
, name
, len
, o
, expected_type
);
1183 oidcpy(oid
, &o
->oid
);
1185 /* "$commit^{/foo}" */
1188 struct commit_list
*list
= NULL
;
1191 * $commit^{/}. Some regex implementation may reject.
1192 * We don't need regex anyway. '' pattern always matches.
1197 prefix
= xstrndup(sp
+ 1, name
+ len
- 1 - (sp
+ 1));
1198 commit_list_insert((struct commit
*)o
, &list
);
1199 ret
= get_oid_oneline(r
, prefix
, oid
, list
);
1206 static int get_describe_name(struct repository
*r
,
1207 const char *name
, int len
,
1208 struct object_id
*oid
)
1211 unsigned flags
= GET_OID_QUIETLY
| GET_OID_COMMIT
;
1213 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
1215 if (!isxdigit(ch
)) {
1216 /* We must be looking at g in "SOMETHING-g"
1217 * for it to be describe output.
1219 if (ch
== 'g' && cp
[-1] == '-') {
1222 return get_short_oid(r
,
1223 cp
, len
, oid
, flags
);
1230 static enum get_oid_result
get_oid_1(struct repository
*r
,
1231 const char *name
, int len
,
1232 struct object_id
*oid
,
1233 unsigned lookup_flags
)
1235 int ret
, has_suffix
;
1239 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
1242 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
1244 if ('0' <= ch
&& ch
<= '9')
1246 if (ch
== '~' || ch
== '^')
1252 unsigned int num
= 0;
1253 int len1
= cp
- name
;
1255 while (cp
< name
+ len
) {
1256 unsigned int digit
= *cp
++ - '0';
1257 if (unsigned_mult_overflows(num
, 10))
1258 return MISSING_OBJECT
;
1260 if (unsigned_add_overflows(num
, digit
))
1261 return MISSING_OBJECT
;
1264 if (!num
&& len1
== len
- 1)
1266 else if (num
> INT_MAX
)
1267 return MISSING_OBJECT
;
1268 if (has_suffix
== '^')
1269 return get_parent(r
, name
, len1
, oid
, num
);
1270 /* else if (has_suffix == '~') -- goes without saying */
1271 return get_nth_ancestor(r
, name
, len1
, oid
, num
);
1274 ret
= peel_onion(r
, name
, len
, oid
, lookup_flags
);
1278 ret
= get_oid_basic(r
, name
, len
, oid
, lookup_flags
);
1282 /* It could be describe output that is "SOMETHING-gXXXX" */
1283 ret
= get_describe_name(r
, name
, len
, oid
);
1287 return get_short_oid(r
, name
, len
, oid
, lookup_flags
);
1291 * This interprets names like ':/Initial revision of "git"' by searching
1292 * through history and returning the first commit whose message starts
1293 * the given regular expression.
1295 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1297 * For a literal '!' character at the beginning of a pattern, you have to repeat
1298 * that, like: ':/!!foo'
1300 * For future extension, all other sequences beginning with ':/!' are reserved.
1303 /* Remember to update object flag allocation in object.h */
1304 #define ONELINE_SEEN (1u<<20)
1306 struct handle_one_ref_cb
{
1307 struct repository
*repo
;
1308 struct commit_list
**list
;
1311 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1315 struct handle_one_ref_cb
*cb
= cb_data
;
1316 struct commit_list
**list
= cb
->list
;
1317 struct object
*object
= parse_object(cb
->repo
, oid
);
1320 if (object
->type
== OBJ_TAG
) {
1321 object
= deref_tag(cb
->repo
, object
, path
,
1326 if (object
->type
!= OBJ_COMMIT
)
1328 commit_list_insert((struct commit
*)object
, list
);
1332 static int get_oid_oneline(struct repository
*r
,
1333 const char *prefix
, struct object_id
*oid
,
1334 struct commit_list
*list
)
1336 struct commit_list
*backup
= NULL
, *l
;
1341 if (prefix
[0] == '!') {
1344 if (prefix
[0] == '-') {
1347 } else if (prefix
[0] != '!') {
1352 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
1355 for (l
= list
; l
; l
= l
->next
) {
1356 l
->item
->object
.flags
|= ONELINE_SEEN
;
1357 commit_list_insert(l
->item
, &backup
);
1360 const char *p
, *buf
;
1361 struct commit
*commit
;
1364 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
1365 if (!parse_object(r
, &commit
->object
.oid
))
1367 buf
= get_commit_buffer(commit
, NULL
);
1368 p
= strstr(buf
, "\n\n");
1369 matches
= negative
^ (p
&& !regexec(®ex
, p
+ 2, 0, NULL
, 0));
1370 unuse_commit_buffer(commit
, buf
);
1373 oidcpy(oid
, &commit
->object
.oid
);
1379 free_commit_list(list
);
1380 for (l
= backup
; l
; l
= l
->next
)
1381 clear_commit_marks(l
->item
, ONELINE_SEEN
);
1382 free_commit_list(backup
);
1383 return found
? 0 : -1;
1386 struct grab_nth_branch_switch_cbdata
{
1391 static int grab_nth_branch_switch(struct object_id
*ooid UNUSED
,
1392 struct object_id
*noid UNUSED
,
1393 const char *email UNUSED
,
1394 timestamp_t timestamp UNUSED
,
1396 const char *message
, void *cb_data
)
1398 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
1399 const char *match
= NULL
, *target
= NULL
;
1402 if (skip_prefix(message
, "checkout: moving from ", &match
))
1403 target
= strstr(match
, " to ");
1405 if (!match
|| !target
)
1407 if (--(cb
->remaining
) == 0) {
1408 len
= target
- match
;
1409 strbuf_reset(cb
->sb
);
1410 strbuf_add(cb
->sb
, match
, len
);
1411 return 1; /* we are done */
1417 * Parse @{-N} syntax, return the number of characters parsed
1418 * if successful; otherwise signal an error with negative value.
1420 static int interpret_nth_prior_checkout(struct repository
*r
,
1421 const char *name
, int namelen
,
1426 struct grab_nth_branch_switch_cbdata cb
;
1432 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
1434 brace
= memchr(name
, '}', namelen
);
1437 nth
= strtol(name
+ 3, &num_end
, 10);
1438 if (num_end
!= brace
)
1445 retval
= refs_for_each_reflog_ent_reverse(get_main_ref_store(r
),
1446 "HEAD", grab_nth_branch_switch
, &cb
);
1448 retval
= brace
- name
+ 1;
1455 int repo_get_oid_mb(struct repository
*r
,
1457 struct object_id
*oid
)
1459 struct commit
*one
, *two
;
1460 struct commit_list
*mbs
;
1461 struct object_id oid_tmp
;
1465 dots
= strstr(name
, "...");
1467 return repo_get_oid(r
, name
, oid
);
1469 st
= repo_get_oid(r
, "HEAD", &oid_tmp
);
1472 strbuf_init(&sb
, dots
- name
);
1473 strbuf_add(&sb
, name
, dots
- name
);
1474 st
= repo_get_oid_committish(r
, sb
.buf
, &oid_tmp
);
1475 strbuf_release(&sb
);
1479 one
= lookup_commit_reference_gently(r
, &oid_tmp
, 0);
1483 if (repo_get_oid_committish(r
, dots
[3] ? (dots
+ 3) : "HEAD", &oid_tmp
))
1485 two
= lookup_commit_reference_gently(r
, &oid_tmp
, 0);
1488 mbs
= repo_get_merge_bases(r
, one
, two
);
1489 if (!mbs
|| mbs
->next
)
1493 oidcpy(oid
, &mbs
->item
->object
.oid
);
1495 free_commit_list(mbs
);
1499 /* parse @something syntax, when 'something' is not {.*} */
1500 static int interpret_empty_at(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1504 if (len
|| name
[1] == '{')
1507 /* make sure it's a single @, or @@{.*}, not @foo */
1508 next
= memchr(name
+ len
+ 1, '@', namelen
- len
- 1);
1509 if (next
&& next
[1] != '{')
1512 next
= name
+ namelen
;
1513 if (next
!= name
+ 1)
1517 strbuf_add(buf
, "HEAD", 4);
1521 static int reinterpret(struct repository
*r
,
1522 const char *name
, int namelen
, int len
,
1523 struct strbuf
*buf
, unsigned allowed
)
1525 /* we have extra data, which might need further processing */
1526 struct strbuf tmp
= STRBUF_INIT
;
1527 int used
= buf
->len
;
1529 struct interpret_branch_name_options options
= {
1533 strbuf_add(buf
, name
+ len
, namelen
- len
);
1534 ret
= repo_interpret_branch_name(r
, buf
->buf
, buf
->len
, &tmp
, &options
);
1535 /* that data was not interpreted, remove our cruft */
1537 strbuf_setlen(buf
, used
);
1541 strbuf_addbuf(buf
, &tmp
);
1542 strbuf_release(&tmp
);
1543 /* tweak for size of {-N} versus expanded ref name */
1544 return ret
- used
+ len
;
1547 static void set_shortened_ref(struct repository
*r
, struct strbuf
*buf
, const char *ref
)
1549 char *s
= refs_shorten_unambiguous_ref(get_main_ref_store(r
), ref
, 0);
1551 strbuf_addstr(buf
, s
);
1555 static int branch_interpret_allowed(const char *refname
, unsigned allowed
)
1560 if ((allowed
& INTERPRET_BRANCH_LOCAL
) &&
1561 starts_with(refname
, "refs/heads/"))
1563 if ((allowed
& INTERPRET_BRANCH_REMOTE
) &&
1564 starts_with(refname
, "refs/remotes/"))
1570 static int interpret_branch_mark(struct repository
*r
,
1571 const char *name
, int namelen
,
1572 int at
, struct strbuf
*buf
,
1573 int (*get_mark
)(const char *, int),
1574 const char *(*get_data
)(struct branch
*,
1576 const struct interpret_branch_name_options
*options
)
1579 struct branch
*branch
;
1580 struct strbuf err
= STRBUF_INIT
;
1583 len
= get_mark(name
+ at
, namelen
- at
);
1587 if (memchr(name
, ':', at
))
1591 char *name_str
= xmemdupz(name
, at
);
1592 branch
= branch_get(name_str
);
1595 branch
= branch_get(NULL
);
1597 value
= get_data(branch
, &err
);
1599 if (options
->nonfatal_dangling_mark
) {
1600 strbuf_release(&err
);
1607 if (!branch_interpret_allowed(value
, options
->allowed
))
1610 set_shortened_ref(r
, buf
, value
);
1614 int repo_interpret_branch_name(struct repository
*r
,
1615 const char *name
, int namelen
,
1617 const struct interpret_branch_name_options
*options
)
1624 namelen
= strlen(name
);
1626 if (!options
->allowed
|| (options
->allowed
& INTERPRET_BRANCH_LOCAL
)) {
1627 len
= interpret_nth_prior_checkout(r
, name
, namelen
, buf
);
1629 return len
; /* syntax Ok, not enough switches */
1630 } else if (len
> 0) {
1632 return len
; /* consumed all */
1634 return reinterpret(r
, name
, namelen
, len
, buf
,
1640 (at
= memchr(start
, '@', namelen
- (start
- name
)));
1643 if (!options
->allowed
|| (options
->allowed
& INTERPRET_BRANCH_HEAD
)) {
1644 len
= interpret_empty_at(name
, namelen
, at
- name
, buf
);
1646 return reinterpret(r
, name
, namelen
, len
, buf
,
1650 len
= interpret_branch_mark(r
, name
, namelen
, at
- name
, buf
,
1651 upstream_mark
, branch_get_upstream
,
1656 len
= interpret_branch_mark(r
, name
, namelen
, at
- name
, buf
,
1657 push_mark
, branch_get_push
,
1666 void strbuf_branchname(struct strbuf
*sb
, const char *name
, unsigned allowed
)
1668 int len
= strlen(name
);
1669 struct interpret_branch_name_options options
= {
1672 int used
= interpret_branch_name(name
, len
, sb
, &options
);
1676 strbuf_add(sb
, name
+ used
, len
- used
);
1679 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
1681 if (startup_info
->have_repository
)
1682 strbuf_branchname(sb
, name
, INTERPRET_BRANCH_LOCAL
);
1684 strbuf_addstr(sb
, name
);
1687 * This splice must be done even if we end up rejecting the
1688 * name; builtin/branch.c::copy_or_rename_branch() still wants
1689 * to see what the name expanded to so that "branch -m" can be
1690 * used as a tool to correct earlier mistakes.
1692 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
1695 !strcmp(sb
->buf
, "refs/heads/HEAD"))
1698 return check_refname_format(sb
->buf
, 0);
1702 * This is like "get_oid_basic()", except it allows "object ID expressions",
1703 * notably "xyz^" for "parent of xyz"
1705 int repo_get_oid(struct repository
*r
, const char *name
, struct object_id
*oid
)
1707 struct object_context unused
;
1708 return get_oid_with_context(r
, name
, 0, oid
, &unused
);
1712 * This returns a non-zero value if the string (built using printf
1713 * format and the given arguments) is not a valid object.
1715 int get_oidf(struct object_id
*oid
, const char *fmt
, ...)
1719 struct strbuf sb
= STRBUF_INIT
;
1722 strbuf_vaddf(&sb
, fmt
, ap
);
1725 ret
= get_oid(sb
.buf
, oid
);
1726 strbuf_release(&sb
);
1732 * Many callers know that the user meant to name a commit-ish by
1733 * syntactical positions where the object name appears. Calling this
1734 * function allows the machinery to disambiguate shorter-than-unique
1735 * abbreviated object names between commit-ish and others.
1737 * Note that this does NOT error out when the named object is not a
1738 * commit-ish. It is merely to give a hint to the disambiguation
1741 int repo_get_oid_committish(struct repository
*r
,
1743 struct object_id
*oid
)
1745 struct object_context unused
;
1746 return get_oid_with_context(r
, name
, GET_OID_COMMITTISH
,
1750 int repo_get_oid_treeish(struct repository
*r
,
1752 struct object_id
*oid
)
1754 struct object_context unused
;
1755 return get_oid_with_context(r
, name
, GET_OID_TREEISH
,
1759 int repo_get_oid_commit(struct repository
*r
,
1761 struct object_id
*oid
)
1763 struct object_context unused
;
1764 return get_oid_with_context(r
, name
, GET_OID_COMMIT
,
1768 int repo_get_oid_tree(struct repository
*r
,
1770 struct object_id
*oid
)
1772 struct object_context unused
;
1773 return get_oid_with_context(r
, name
, GET_OID_TREE
,
1777 int repo_get_oid_blob(struct repository
*r
,
1779 struct object_id
*oid
)
1781 struct object_context unused
;
1782 return get_oid_with_context(r
, name
, GET_OID_BLOB
,
1786 /* Must be called only when object_name:filename doesn't exist. */
1787 static void diagnose_invalid_oid_path(struct repository
*r
,
1789 const char *filename
,
1790 const struct object_id
*tree_oid
,
1791 const char *object_name
,
1792 int object_name_len
)
1794 struct object_id oid
;
1795 unsigned short mode
;
1800 if (file_exists(filename
))
1801 die(_("path '%s' exists on disk, but not in '%.*s'"),
1802 filename
, object_name_len
, object_name
);
1803 if (is_missing_file_error(errno
)) {
1804 char *fullname
= xstrfmt("%s%s", prefix
, filename
);
1806 if (!get_tree_entry(r
, tree_oid
, fullname
, &oid
, &mode
)) {
1807 die(_("path '%s' exists, but not '%s'\n"
1808 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
1811 object_name_len
, object_name
,
1813 object_name_len
, object_name
,
1816 die(_("path '%s' does not exist in '%.*s'"),
1817 filename
, object_name_len
, object_name
);
1821 /* Must be called only when :stage:filename doesn't exist. */
1822 static void diagnose_invalid_index_path(struct repository
*r
,
1825 const char *filename
)
1827 struct index_state
*istate
= r
->index
;
1828 const struct cache_entry
*ce
;
1830 unsigned namelen
= strlen(filename
);
1831 struct strbuf fullname
= STRBUF_INIT
;
1836 /* Wrong stage number? */
1837 pos
= index_name_pos(istate
, filename
, namelen
);
1840 if (pos
< istate
->cache_nr
) {
1841 ce
= istate
->cache
[pos
];
1842 if (!S_ISSPARSEDIR(ce
->ce_mode
) &&
1843 ce_namelen(ce
) == namelen
&&
1844 !memcmp(ce
->name
, filename
, namelen
))
1845 die(_("path '%s' is in the index, but not at stage %d\n"
1846 "hint: Did you mean ':%d:%s'?"),
1848 ce_stage(ce
), filename
);
1851 /* Confusion between relative and absolute filenames? */
1852 strbuf_addstr(&fullname
, prefix
);
1853 strbuf_addstr(&fullname
, filename
);
1854 pos
= index_name_pos(istate
, fullname
.buf
, fullname
.len
);
1857 if (pos
< istate
->cache_nr
) {
1858 ce
= istate
->cache
[pos
];
1859 if (!S_ISSPARSEDIR(ce
->ce_mode
) &&
1860 ce_namelen(ce
) == fullname
.len
&&
1861 !memcmp(ce
->name
, fullname
.buf
, fullname
.len
))
1862 die(_("path '%s' is in the index, but not '%s'\n"
1863 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
1864 fullname
.buf
, filename
,
1865 ce_stage(ce
), fullname
.buf
,
1866 ce_stage(ce
), filename
);
1869 if (repo_file_exists(r
, filename
))
1870 die(_("path '%s' exists on disk, but not in the index"), filename
);
1871 if (is_missing_file_error(errno
))
1872 die(_("path '%s' does not exist (neither on disk nor in the index)"),
1875 strbuf_release(&fullname
);
1879 static char *resolve_relative_path(struct repository
*r
, const char *rel
)
1881 if (!starts_with(rel
, "./") && !starts_with(rel
, "../"))
1884 if (r
!= the_repository
|| !is_inside_work_tree())
1885 die(_("relative path syntax can't be used outside working tree"));
1887 /* die() inside prefix_path() if resolved path is outside worktree */
1888 return prefix_path(startup_info
->prefix
,
1889 startup_info
->prefix
? strlen(startup_info
->prefix
) : 0,
1893 static int reject_tree_in_index(struct repository
*repo
,
1895 const struct cache_entry
*ce
,
1900 if (!S_ISSPARSEDIR(ce
->ce_mode
))
1903 diagnose_invalid_index_path(repo
, stage
, prefix
, cp
);
1907 static enum get_oid_result
get_oid_with_context_1(struct repository
*repo
,
1911 struct object_id
*oid
,
1912 struct object_context
*oc
)
1914 int ret
, bracket_depth
;
1915 int namelen
= strlen(name
);
1917 int only_to_die
= flags
& GET_OID_ONLY_TO_DIE
;
1919 memset(oc
, 0, sizeof(*oc
));
1920 oc
->mode
= S_IFINVALID
;
1921 strbuf_init(&oc
->symlink_path
, 0);
1922 ret
= get_oid_1(repo
, name
, namelen
, oid
, flags
);
1923 if (!ret
&& flags
& GET_OID_REQUIRE_PATH
)
1924 die(_("<object>:<path> required, only <object> '%s' given"),
1929 * tree:path --> object name of path in tree
1930 * :path -> object name of absolute path in index
1931 * :./path -> object name of path relative to cwd in index
1932 * :[0-3]:path -> object name of path in index at stage
1933 * :/foo -> recent commit matching foo
1935 if (name
[0] == ':') {
1937 const struct cache_entry
*ce
;
1938 char *new_path
= NULL
;
1940 if (!only_to_die
&& namelen
> 2 && name
[1] == '/') {
1941 struct handle_one_ref_cb cb
;
1942 struct commit_list
*list
= NULL
;
1946 refs_for_each_ref(get_main_ref_store(repo
), handle_one_ref
, &cb
);
1947 refs_head_ref(get_main_ref_store(repo
), handle_one_ref
, &cb
);
1948 commit_list_sort_by_date(&list
);
1949 return get_oid_oneline(repo
, name
+ 2, oid
, list
);
1953 name
[1] < '0' || '3' < name
[1])
1956 stage
= name
[1] - '0';
1959 new_path
= resolve_relative_path(repo
, cp
);
1961 namelen
= namelen
- (cp
- name
);
1964 namelen
= strlen(cp
);
1967 if (flags
& GET_OID_RECORD_PATH
)
1968 oc
->path
= xstrdup(cp
);
1970 if (!repo
->index
|| !repo
->index
->cache
)
1971 repo_read_index(repo
);
1972 pos
= index_name_pos(repo
->index
, cp
, namelen
);
1975 while (pos
< repo
->index
->cache_nr
) {
1976 ce
= repo
->index
->cache
[pos
];
1977 if (ce_namelen(ce
) != namelen
||
1978 memcmp(ce
->name
, cp
, namelen
))
1980 if (ce_stage(ce
) == stage
) {
1982 if (reject_tree_in_index(repo
, only_to_die
, ce
,
1985 oidcpy(oid
, &ce
->oid
);
1986 oc
->mode
= ce
->ce_mode
;
1991 if (only_to_die
&& name
[1] && name
[1] != '/')
1992 diagnose_invalid_index_path(repo
, stage
, prefix
, cp
);
1996 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
1999 else if (bracket_depth
&& *cp
== '}')
2001 else if (!bracket_depth
&& *cp
== ':')
2005 struct object_id tree_oid
;
2006 int len
= cp
- name
;
2007 unsigned sub_flags
= flags
;
2009 sub_flags
&= ~GET_OID_DISAMBIGUATORS
;
2010 sub_flags
|= GET_OID_TREEISH
;
2012 if (!get_oid_1(repo
, name
, len
, &tree_oid
, sub_flags
)) {
2013 const char *filename
= cp
+1;
2014 char *new_filename
= NULL
;
2016 new_filename
= resolve_relative_path(repo
, filename
);
2018 filename
= new_filename
;
2019 if (flags
& GET_OID_FOLLOW_SYMLINKS
) {
2020 ret
= get_tree_entry_follow_symlinks(repo
, &tree_oid
,
2021 filename
, oid
, &oc
->symlink_path
,
2024 ret
= get_tree_entry(repo
, &tree_oid
, filename
, oid
,
2026 if (ret
&& only_to_die
) {
2027 diagnose_invalid_oid_path(repo
, prefix
,
2033 if (flags
& GET_OID_RECORD_PATH
)
2034 oc
->path
= xstrdup(filename
);
2040 die(_("invalid object name '%.*s'."), len
, name
);
2047 * Call this function when you know "name" given by the end user must
2048 * name an object but it doesn't; the function _may_ die with a better
2049 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
2050 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
2051 * you have a chance to diagnose the error further.
2053 void maybe_die_on_misspelt_object_name(struct repository
*r
,
2057 struct object_context oc
;
2058 struct object_id oid
;
2059 get_oid_with_context_1(r
, name
, GET_OID_ONLY_TO_DIE
| GET_OID_QUIETLY
,
2063 enum get_oid_result
get_oid_with_context(struct repository
*repo
,
2066 struct object_id
*oid
,
2067 struct object_context
*oc
)
2069 if (flags
& GET_OID_FOLLOW_SYMLINKS
&& flags
& GET_OID_ONLY_TO_DIE
)
2070 BUG("incompatible flags for get_oid_with_context");
2071 return get_oid_with_context_1(repo
, str
, flags
, NULL
, oid
, oc
);