12 #include "oid-array.h"
14 #include "object-store.h"
15 #include "repository.h"
16 #include "submodule.h"
18 #include "commit-reach.h"
21 static int get_oid_oneline(struct repository
*r
, const char *, struct object_id
*, struct commit_list
*);
23 typedef int (*disambiguate_hint_fn
)(struct repository
*, const struct object_id
*, void *);
25 struct disambiguate_state
{
26 int len
; /* length of prefix in hex chars */
27 char hex_pfx
[GIT_MAX_HEXSZ
+ 1];
28 struct object_id bin_pfx
;
30 struct repository
*repo
;
31 disambiguate_hint_fn fn
;
33 struct object_id candidate
;
34 unsigned candidate_exists
:1;
35 unsigned candidate_checked
:1;
36 unsigned candidate_ok
:1;
37 unsigned disambiguate_fn_used
:1;
39 unsigned always_call_fn
:1;
42 static void update_candidates(struct disambiguate_state
*ds
, const struct object_id
*current
)
44 if (ds
->always_call_fn
) {
45 ds
->ambiguous
= ds
->fn(ds
->repo
, current
, ds
->cb_data
) ? 1 : 0;
48 if (!ds
->candidate_exists
) {
49 /* this is the first candidate */
50 oidcpy(&ds
->candidate
, current
);
51 ds
->candidate_exists
= 1;
53 } else if (oideq(&ds
->candidate
, current
)) {
54 /* the same as what we already have seen */
59 /* cannot disambiguate between ds->candidate and current */
64 if (!ds
->candidate_checked
) {
65 ds
->candidate_ok
= ds
->fn(ds
->repo
, &ds
->candidate
, ds
->cb_data
);
66 ds
->disambiguate_fn_used
= 1;
67 ds
->candidate_checked
= 1;
70 if (!ds
->candidate_ok
) {
71 /* discard the candidate; we know it does not satisfy fn */
72 oidcpy(&ds
->candidate
, current
);
73 ds
->candidate_checked
= 0;
77 /* if we reach this point, we know ds->candidate satisfies fn */
78 if (ds
->fn(ds
->repo
, current
, ds
->cb_data
)) {
80 * if both current and candidate satisfy fn, we cannot
87 /* otherwise, current can be discarded and candidate is still good */
90 static int match_hash(unsigned, const unsigned char *, const unsigned char *);
92 static enum cb_next
match_prefix(const struct object_id
*oid
, void *arg
)
94 struct disambiguate_state
*ds
= arg
;
95 /* no need to call match_hash, oidtree_each did prefix match */
96 update_candidates(ds
, oid
);
97 return ds
->ambiguous
? CB_BREAK
: CB_CONTINUE
;
100 static void find_short_object_filename(struct disambiguate_state
*ds
)
102 struct object_directory
*odb
;
104 for (odb
= ds
->repo
->objects
->odb
; odb
&& !ds
->ambiguous
; odb
= odb
->next
)
105 oidtree_each(odb_loose_cache(odb
, &ds
->bin_pfx
),
106 &ds
->bin_pfx
, ds
->len
, match_prefix
, ds
);
109 static int match_hash(unsigned len
, const unsigned char *a
, const unsigned char *b
)
119 if ((*a
^ *b
) & 0xf0)
124 static void unique_in_midx(struct multi_pack_index
*m
,
125 struct disambiguate_state
*ds
)
127 uint32_t num
, i
, first
= 0;
128 const struct object_id
*current
= NULL
;
129 num
= m
->num_objects
;
134 bsearch_midx(&ds
->bin_pfx
, m
, &first
);
137 * At this point, "first" is the location of the lowest object
138 * with an object name that could match "bin_pfx". See if we have
139 * 0, 1 or more objects that actually match(es).
141 for (i
= first
; i
< num
&& !ds
->ambiguous
; i
++) {
142 struct object_id oid
;
143 current
= nth_midxed_object_oid(&oid
, m
, i
);
144 if (!match_hash(ds
->len
, ds
->bin_pfx
.hash
, current
->hash
))
146 update_candidates(ds
, current
);
150 static void unique_in_pack(struct packed_git
*p
,
151 struct disambiguate_state
*ds
)
153 uint32_t num
, i
, first
= 0;
155 if (p
->multi_pack_index
)
158 if (open_pack_index(p
) || !p
->num_objects
)
161 num
= p
->num_objects
;
162 bsearch_pack(&ds
->bin_pfx
, p
, &first
);
165 * At this point, "first" is the location of the lowest object
166 * with an object name that could match "bin_pfx". See if we have
167 * 0, 1 or more objects that actually match(es).
169 for (i
= first
; i
< num
&& !ds
->ambiguous
; i
++) {
170 struct object_id oid
;
171 nth_packed_object_id(&oid
, p
, i
);
172 if (!match_hash(ds
->len
, ds
->bin_pfx
.hash
, oid
.hash
))
174 update_candidates(ds
, &oid
);
178 static void find_short_packed_object(struct disambiguate_state
*ds
)
180 struct multi_pack_index
*m
;
181 struct packed_git
*p
;
183 for (m
= get_multi_pack_index(ds
->repo
); m
&& !ds
->ambiguous
;
185 unique_in_midx(m
, ds
);
186 for (p
= get_packed_git(ds
->repo
); p
&& !ds
->ambiguous
;
188 unique_in_pack(p
, ds
);
191 static int finish_object_disambiguation(struct disambiguate_state
*ds
,
192 struct object_id
*oid
)
195 return SHORT_NAME_AMBIGUOUS
;
197 if (!ds
->candidate_exists
)
198 return MISSING_OBJECT
;
200 if (!ds
->candidate_checked
)
202 * If this is the only candidate, there is no point
203 * calling the disambiguation hint callback.
205 * On the other hand, if the current candidate
206 * replaced an earlier candidate that did _not_ pass
207 * the disambiguation hint callback, then we do have
208 * more than one objects that match the short name
209 * given, so we should make sure this one matches;
210 * otherwise, if we discovered this one and the one
211 * that we previously discarded in the reverse order,
212 * we would end up showing different results in the
215 ds
->candidate_ok
= (!ds
->disambiguate_fn_used
||
216 ds
->fn(ds
->repo
, &ds
->candidate
, ds
->cb_data
));
218 if (!ds
->candidate_ok
)
219 return SHORT_NAME_AMBIGUOUS
;
221 oidcpy(oid
, &ds
->candidate
);
225 static int disambiguate_commit_only(struct repository
*r
,
226 const struct object_id
*oid
,
227 void *cb_data UNUSED
)
229 int kind
= oid_object_info(r
, oid
, NULL
);
230 return kind
== OBJ_COMMIT
;
233 static int disambiguate_committish_only(struct repository
*r
,
234 const struct object_id
*oid
,
235 void *cb_data UNUSED
)
240 kind
= oid_object_info(r
, oid
, NULL
);
241 if (kind
== OBJ_COMMIT
)
246 /* We need to do this the hard way... */
247 obj
= deref_tag(r
, parse_object(r
, oid
), NULL
, 0);
248 if (obj
&& obj
->type
== OBJ_COMMIT
)
253 static int disambiguate_tree_only(struct repository
*r
,
254 const struct object_id
*oid
,
255 void *cb_data UNUSED
)
257 int kind
= oid_object_info(r
, oid
, NULL
);
258 return kind
== OBJ_TREE
;
261 static int disambiguate_treeish_only(struct repository
*r
,
262 const struct object_id
*oid
,
263 void *cb_data UNUSED
)
268 kind
= oid_object_info(r
, oid
, NULL
);
269 if (kind
== OBJ_TREE
|| kind
== OBJ_COMMIT
)
274 /* We need to do this the hard way... */
275 obj
= deref_tag(r
, parse_object(r
, oid
), NULL
, 0);
276 if (obj
&& (obj
->type
== OBJ_TREE
|| obj
->type
== OBJ_COMMIT
))
281 static int disambiguate_blob_only(struct repository
*r
,
282 const struct object_id
*oid
,
283 void *cb_data UNUSED
)
285 int kind
= oid_object_info(r
, oid
, NULL
);
286 return kind
== OBJ_BLOB
;
289 static disambiguate_hint_fn default_disambiguate_hint
;
291 int set_disambiguate_hint_config(const char *var
, const char *value
)
293 static const struct {
295 disambiguate_hint_fn fn
;
298 { "commit", disambiguate_commit_only
},
299 { "committish", disambiguate_committish_only
},
300 { "tree", disambiguate_tree_only
},
301 { "treeish", disambiguate_treeish_only
},
302 { "blob", disambiguate_blob_only
}
307 return config_error_nonbool(var
);
309 for (i
= 0; i
< ARRAY_SIZE(hints
); i
++) {
310 if (!strcasecmp(value
, hints
[i
].name
)) {
311 default_disambiguate_hint
= hints
[i
].fn
;
316 return error("unknown hint type for '%s': %s", var
, value
);
319 static int init_object_disambiguation(struct repository
*r
,
320 const char *name
, int len
,
321 struct disambiguate_state
*ds
)
325 if (len
< MINIMUM_ABBREV
|| len
> the_hash_algo
->hexsz
)
328 memset(ds
, 0, sizeof(*ds
));
330 for (i
= 0; i
< len
;i
++) {
331 unsigned char c
= name
[i
];
333 if (c
>= '0' && c
<= '9')
335 else if (c
>= 'a' && c
<= 'f')
337 else if (c
>= 'A' && c
<='F') {
346 ds
->bin_pfx
.hash
[i
>> 1] |= val
;
350 ds
->hex_pfx
[len
] = '\0';
356 struct ambiguous_output
{
357 const struct disambiguate_state
*ds
;
358 struct strbuf advice
;
362 static int show_ambiguous_object(const struct object_id
*oid
, void *data
)
364 struct ambiguous_output
*state
= data
;
365 const struct disambiguate_state
*ds
= state
->ds
;
366 struct strbuf
*advice
= &state
->advice
;
367 struct strbuf
*sb
= &state
->sb
;
371 if (ds
->fn
&& !ds
->fn(ds
->repo
, oid
, ds
->cb_data
))
374 hash
= repo_find_unique_abbrev(ds
->repo
, oid
, DEFAULT_ABBREV
);
375 type
= oid_object_info(ds
->repo
, oid
, NULL
);
379 * TRANSLATORS: This is a line of ambiguous object
380 * output shown when we cannot look up or parse the
381 * object in question. E.g. "deadbeef [bad object]".
383 strbuf_addf(sb
, _("%s [bad object]"), hash
);
387 assert(type
== OBJ_TREE
|| type
== OBJ_COMMIT
||
388 type
== OBJ_BLOB
|| type
== OBJ_TAG
);
390 if (type
== OBJ_COMMIT
) {
391 struct strbuf date
= STRBUF_INIT
;
392 struct strbuf msg
= STRBUF_INIT
;
393 struct commit
*commit
= lookup_commit(ds
->repo
, oid
);
396 struct pretty_print_context pp
= {0};
397 pp
.date_mode
.type
= DATE_SHORT
;
398 format_commit_message(commit
, "%ad", &date
, &pp
);
399 format_commit_message(commit
, "%s", &msg
, &pp
);
403 * TRANSLATORS: This is a line of ambiguous commit
404 * object output. E.g.:
406 * "deadbeef commit 2021-01-01 - Some Commit Message"
408 strbuf_addf(sb
, _("%s commit %s - %s"), hash
, date
.buf
,
411 strbuf_release(&date
);
412 strbuf_release(&msg
);
413 } else if (type
== OBJ_TAG
) {
414 struct tag
*tag
= lookup_tag(ds
->repo
, oid
);
416 if (!parse_tag(tag
) && tag
->tag
) {
418 * TRANSLATORS: This is a line of ambiguous
419 * tag object output. E.g.:
421 * "deadbeef tag 2022-01-01 - Some Tag Message"
423 * The second argument is the YYYY-MM-DD found
426 * The third argument is the "tag" string
429 strbuf_addf(sb
, _("%s tag %s - %s"), hash
,
430 show_date(tag
->date
, 0, DATE_MODE(SHORT
)),
434 * TRANSLATORS: This is a line of ambiguous
435 * tag object output where we couldn't parse
436 * the tag itself. E.g.:
438 * "deadbeef [bad tag, could not parse it]"
440 strbuf_addf(sb
, _("%s [bad tag, could not parse it]"),
443 } else if (type
== OBJ_TREE
) {
445 * TRANSLATORS: This is a line of ambiguous <type>
446 * object output. E.g. "deadbeef tree".
448 strbuf_addf(sb
, _("%s tree"), hash
);
449 } else if (type
== OBJ_BLOB
) {
451 * TRANSLATORS: This is a line of ambiguous <type>
452 * object output. E.g. "deadbeef blob".
454 strbuf_addf(sb
, _("%s blob"), hash
);
460 * TRANSLATORS: This is line item of ambiguous object output
461 * from describe_ambiguous_object() above. For RTL languages
462 * you'll probably want to swap the "%s" and leading " " space
465 strbuf_addf(advice
, _(" %s\n"), sb
->buf
);
471 static int collect_ambiguous(const struct object_id
*oid
, void *data
)
473 oid_array_append(data
, oid
);
477 static int repo_collect_ambiguous(struct repository
*r UNUSED
,
478 const struct object_id
*oid
,
481 return collect_ambiguous(oid
, data
);
484 static int sort_ambiguous(const void *a
, const void *b
, void *ctx
)
486 struct repository
*sort_ambiguous_repo
= ctx
;
487 int a_type
= oid_object_info(sort_ambiguous_repo
, a
, NULL
);
488 int b_type
= oid_object_info(sort_ambiguous_repo
, b
, NULL
);
493 * Sorts by hash within the same object type, just as
494 * oid_array_for_each_unique() would do.
496 if (a_type
== b_type
)
500 * Between object types show tags, then commits, and finally
503 * The object_type enum is commit, tree, blob, tag, but we
504 * want tag, commit, tree blob. Cleverly (perhaps too
505 * cleverly) do that with modulus, since the enum assigns 1 to
506 * commit, so tag becomes 0.
508 a_type_sort
= a_type
% 4;
509 b_type_sort
= b_type
% 4;
510 return a_type_sort
> b_type_sort
? 1 : -1;
513 static void sort_ambiguous_oid_array(struct repository
*r
, struct oid_array
*a
)
515 QSORT_S(a
->oid
, a
->nr
, sort_ambiguous
, r
);
518 static enum get_oid_result
get_short_oid(struct repository
*r
,
519 const char *name
, int len
,
520 struct object_id
*oid
,
524 struct disambiguate_state ds
;
525 int quietly
= !!(flags
& GET_OID_QUIETLY
);
527 if (init_object_disambiguation(r
, name
, len
, &ds
) < 0)
530 if (HAS_MULTI_BITS(flags
& GET_OID_DISAMBIGUATORS
))
531 BUG("multiple get_short_oid disambiguator flags");
533 if (flags
& GET_OID_COMMIT
)
534 ds
.fn
= disambiguate_commit_only
;
535 else if (flags
& GET_OID_COMMITTISH
)
536 ds
.fn
= disambiguate_committish_only
;
537 else if (flags
& GET_OID_TREE
)
538 ds
.fn
= disambiguate_tree_only
;
539 else if (flags
& GET_OID_TREEISH
)
540 ds
.fn
= disambiguate_treeish_only
;
541 else if (flags
& GET_OID_BLOB
)
542 ds
.fn
= disambiguate_blob_only
;
544 ds
.fn
= default_disambiguate_hint
;
546 find_short_object_filename(&ds
);
547 find_short_packed_object(&ds
);
548 status
= finish_object_disambiguation(&ds
, oid
);
551 * If we didn't find it, do the usual reprepare() slow-path,
552 * since the object may have recently been added to the repository
553 * or migrated from loose to packed.
555 if (status
== MISSING_OBJECT
) {
556 reprepare_packed_git(r
);
557 find_short_object_filename(&ds
);
558 find_short_packed_object(&ds
);
559 status
= finish_object_disambiguation(&ds
, oid
);
562 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
)) {
563 struct oid_array collect
= OID_ARRAY_INIT
;
564 struct ambiguous_output out
= {
567 .advice
= STRBUF_INIT
,
570 error(_("short object ID %s is ambiguous"), ds
.hex_pfx
);
573 * We may still have ambiguity if we simply saw a series of
574 * candidates that did not satisfy our hint function. In
575 * that case, we still want to show them, so disable the hint
581 repo_for_each_abbrev(r
, ds
.hex_pfx
, collect_ambiguous
, &collect
);
582 sort_ambiguous_oid_array(r
, &collect
);
584 if (oid_array_for_each(&collect
, show_ambiguous_object
, &out
))
585 BUG("show_ambiguous_object shouldn't return non-zero");
588 * TRANSLATORS: The argument is the list of ambiguous
589 * objects composed in show_ambiguous_object(). See
590 * its "TRANSLATORS" comments for details.
592 advise(_("The candidates are:\n%s"), out
.advice
.buf
);
594 oid_array_clear(&collect
);
595 strbuf_release(&out
.advice
);
596 strbuf_release(&out
.sb
);
602 int repo_for_each_abbrev(struct repository
*r
, const char *prefix
,
603 each_abbrev_fn fn
, void *cb_data
)
605 struct oid_array collect
= OID_ARRAY_INIT
;
606 struct disambiguate_state ds
;
609 if (init_object_disambiguation(r
, prefix
, strlen(prefix
), &ds
) < 0)
612 ds
.always_call_fn
= 1;
613 ds
.fn
= repo_collect_ambiguous
;
614 ds
.cb_data
= &collect
;
615 find_short_object_filename(&ds
);
616 find_short_packed_object(&ds
);
618 ret
= oid_array_for_each_unique(&collect
, fn
, cb_data
);
619 oid_array_clear(&collect
);
624 * Return the slot of the most-significant bit set in "val". There are various
625 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
626 * probably not a big deal here.
628 static unsigned msb(unsigned long val
)
636 struct min_abbrev_data
{
637 unsigned int init_len
;
638 unsigned int cur_len
;
640 struct repository
*repo
;
641 const struct object_id
*oid
;
644 static inline char get_hex_char_from_oid(const struct object_id
*oid
,
647 static const char hex
[] = "0123456789abcdef";
650 return hex
[oid
->hash
[pos
>> 1] >> 4];
652 return hex
[oid
->hash
[pos
>> 1] & 0xf];
655 static int extend_abbrev_len(const struct object_id
*oid
, void *cb_data
)
657 struct min_abbrev_data
*mad
= cb_data
;
659 unsigned int i
= mad
->init_len
;
660 while (mad
->hex
[i
] && mad
->hex
[i
] == get_hex_char_from_oid(oid
, i
))
663 if (i
< GIT_MAX_RAWSZ
&& i
>= mad
->cur_len
)
664 mad
->cur_len
= i
+ 1;
669 static int repo_extend_abbrev_len(struct repository
*r UNUSED
,
670 const struct object_id
*oid
,
673 return extend_abbrev_len(oid
, cb_data
);
676 static void find_abbrev_len_for_midx(struct multi_pack_index
*m
,
677 struct min_abbrev_data
*mad
)
680 uint32_t num
, first
= 0;
681 struct object_id oid
;
682 const struct object_id
*mad_oid
;
687 num
= m
->num_objects
;
689 match
= bsearch_midx(mad_oid
, m
, &first
);
692 * first is now the position in the packfile where we would insert
693 * mad->hash if it does not exist (or the position of mad->hash if
694 * it does exist). Hence, we consider a maximum of two objects
695 * nearby for the abbreviation length.
699 if (nth_midxed_object_oid(&oid
, m
, first
))
700 extend_abbrev_len(&oid
, mad
);
701 } else if (first
< num
- 1) {
702 if (nth_midxed_object_oid(&oid
, m
, first
+ 1))
703 extend_abbrev_len(&oid
, mad
);
706 if (nth_midxed_object_oid(&oid
, m
, first
- 1))
707 extend_abbrev_len(&oid
, mad
);
709 mad
->init_len
= mad
->cur_len
;
712 static void find_abbrev_len_for_pack(struct packed_git
*p
,
713 struct min_abbrev_data
*mad
)
716 uint32_t num
, first
= 0;
717 struct object_id oid
;
718 const struct object_id
*mad_oid
;
720 if (p
->multi_pack_index
)
723 if (open_pack_index(p
) || !p
->num_objects
)
726 num
= p
->num_objects
;
728 match
= bsearch_pack(mad_oid
, p
, &first
);
731 * first is now the position in the packfile where we would insert
732 * mad->hash if it does not exist (or the position of mad->hash if
733 * it does exist). Hence, we consider a maximum of two objects
734 * nearby for the abbreviation length.
738 if (!nth_packed_object_id(&oid
, p
, first
))
739 extend_abbrev_len(&oid
, mad
);
740 } else if (first
< num
- 1) {
741 if (!nth_packed_object_id(&oid
, p
, first
+ 1))
742 extend_abbrev_len(&oid
, mad
);
745 if (!nth_packed_object_id(&oid
, p
, first
- 1))
746 extend_abbrev_len(&oid
, mad
);
748 mad
->init_len
= mad
->cur_len
;
751 static void find_abbrev_len_packed(struct min_abbrev_data
*mad
)
753 struct multi_pack_index
*m
;
754 struct packed_git
*p
;
756 for (m
= get_multi_pack_index(mad
->repo
); m
; m
= m
->next
)
757 find_abbrev_len_for_midx(m
, mad
);
758 for (p
= get_packed_git(mad
->repo
); p
; p
= p
->next
)
759 find_abbrev_len_for_pack(p
, mad
);
762 int repo_find_unique_abbrev_r(struct repository
*r
, char *hex
,
763 const struct object_id
*oid
, int len
)
765 struct disambiguate_state ds
;
766 struct min_abbrev_data mad
;
767 struct object_id oid_ret
;
768 const unsigned hexsz
= r
->hash_algo
->hexsz
;
771 unsigned long count
= repo_approximate_object_count(r
);
773 * Add one because the MSB only tells us the highest bit set,
774 * not including the value of all the _other_ bits (so "15"
775 * is only one off of 2^4, but the MSB is the 3rd bit.
777 len
= msb(count
) + 1;
779 * We now know we have on the order of 2^len objects, which
780 * expects a collision at 2^(len/2). But we also care about hex
781 * chars, not bits, and there are 4 bits per hex. So all
782 * together we need to divide by 2 and round up.
784 len
= DIV_ROUND_UP(len
, 2);
786 * For very small repos, we stick with our regular fallback.
788 if (len
< FALLBACK_DEFAULT_ABBREV
)
789 len
= FALLBACK_DEFAULT_ABBREV
;
792 oid_to_hex_r(hex
, oid
);
793 if (len
== hexsz
|| !len
)
802 find_abbrev_len_packed(&mad
);
804 if (init_object_disambiguation(r
, hex
, mad
.cur_len
, &ds
) < 0)
807 ds
.fn
= repo_extend_abbrev_len
;
808 ds
.always_call_fn
= 1;
809 ds
.cb_data
= (void *)&mad
;
811 find_short_object_filename(&ds
);
812 (void)finish_object_disambiguation(&ds
, &oid_ret
);
814 hex
[mad
.cur_len
] = 0;
818 const char *repo_find_unique_abbrev(struct repository
*r
,
819 const struct object_id
*oid
,
823 static char hexbuffer
[4][GIT_MAX_HEXSZ
+ 1];
824 char *hex
= hexbuffer
[bufno
];
825 bufno
= (bufno
+ 1) % ARRAY_SIZE(hexbuffer
);
826 repo_find_unique_abbrev_r(r
, hex
, oid
, len
);
830 static int ambiguous_path(const char *path
, int len
)
835 for (cnt
= 0; cnt
< len
; cnt
++) {
855 static inline int at_mark(const char *string
, int len
,
856 const char **suffix
, int nr
)
860 for (i
= 0; i
< nr
; i
++) {
861 int suffix_len
= strlen(suffix
[i
]);
862 if (suffix_len
<= len
863 && !strncasecmp(string
, suffix
[i
], suffix_len
))
869 static inline int upstream_mark(const char *string
, int len
)
871 const char *suffix
[] = { "@{upstream}", "@{u}" };
872 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
875 static inline int push_mark(const char *string
, int len
)
877 const char *suffix
[] = { "@{push}" };
878 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
881 static enum get_oid_result
get_oid_1(struct repository
*r
, const char *name
, int len
, struct object_id
*oid
, unsigned lookup_flags
);
882 static int interpret_nth_prior_checkout(struct repository
*r
, const char *name
, int namelen
, struct strbuf
*buf
);
884 static int get_oid_basic(struct repository
*r
, const char *str
, int len
,
885 struct object_id
*oid
, unsigned int flags
)
887 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
888 static const char *object_name_msg
= N_(
889 "Git normally never creates a ref that ends with 40 hex characters\n"
890 "because it will be ignored when you just specify 40-hex. These refs\n"
891 "may be created by mistake. For example,\n"
893 " git switch -c $br $(git rev-parse ...)\n"
895 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
896 "examine these refs and maybe delete them. Turn this message off by\n"
897 "running \"git config advice.objectNameWarning false\"");
898 struct object_id tmp_oid
;
899 char *real_ref
= NULL
;
901 int at
, reflog_len
, nth_prior
= 0;
902 int fatal
= !(flags
& GET_OID_QUIETLY
);
904 if (len
== r
->hash_algo
->hexsz
&& !get_oid_hex(str
, oid
)) {
905 if (warn_ambiguous_refs
&& warn_on_object_refname_ambiguity
) {
906 refs_found
= repo_dwim_ref(r
, str
, len
, &tmp_oid
, &real_ref
, 0);
907 if (refs_found
> 0) {
908 warning(warn_msg
, len
, str
);
909 if (advice_enabled(ADVICE_OBJECT_NAME_WARNING
))
910 fprintf(stderr
, "%s\n", _(object_name_msg
));
917 /* basic@{time or number or -number} format to query ref-log */
919 if (len
&& str
[len
-1] == '}') {
920 for (at
= len
-4; at
>= 0; at
--) {
921 if (str
[at
] == '@' && str
[at
+1] == '{') {
922 if (str
[at
+2] == '-') {
924 /* @{-N} not at start */
929 if (!upstream_mark(str
+ at
, len
- at
) &&
930 !push_mark(str
+ at
, len
- at
)) {
931 reflog_len
= (len
-1) - (at
+2);
939 /* Accept only unambiguous ref paths. */
940 if (len
&& ambiguous_path(str
, len
))
944 struct strbuf buf
= STRBUF_INIT
;
947 if (interpret_nth_prior_checkout(r
, str
, len
, &buf
) > 0) {
948 detached
= (buf
.len
== r
->hash_algo
->hexsz
&& !get_oid_hex(buf
.buf
, oid
));
949 strbuf_release(&buf
);
955 if (!len
&& reflog_len
)
956 /* allow "@{...}" to mean the current branch reflog */
957 refs_found
= repo_dwim_ref(r
, "HEAD", 4, oid
, &real_ref
, !fatal
);
959 refs_found
= repo_dwim_log(r
, str
, len
, oid
, &real_ref
);
961 refs_found
= repo_dwim_ref(r
, str
, len
, oid
, &real_ref
, !fatal
);
966 if (warn_ambiguous_refs
&& !(flags
& GET_OID_QUIETLY
) &&
968 !get_short_oid(r
, str
, len
, &tmp_oid
, GET_OID_QUIETLY
)))
969 warning(warn_msg
, len
, str
);
977 /* Is it asking for N-th entry, or approxidate? */
978 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
979 char ch
= str
[at
+2+i
];
980 if ('0' <= ch
&& ch
<= '9')
981 nth
= nth
* 10 + ch
- '0';
985 if (100000000 <= nth
) {
992 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
993 at_time
= approxidate_careful(tmp
, &errors
);
1000 if (read_ref_at(get_main_ref_store(r
),
1001 real_ref
, flags
, at_time
, nth
, oid
, NULL
,
1002 &co_time
, &co_tz
, &co_cnt
)) {
1004 if (!skip_prefix(real_ref
, "refs/heads/", &str
))
1009 if (!(flags
& GET_OID_QUIETLY
)) {
1010 warning(_("log for '%.*s' only goes back to %s"),
1012 show_date(co_time
, co_tz
, DATE_MODE(RFC2822
)));
1015 if (flags
& GET_OID_QUIETLY
) {
1018 die(_("log for '%.*s' only has %d entries"),
1028 static enum get_oid_result
get_parent(struct repository
*r
,
1029 const char *name
, int len
,
1030 struct object_id
*result
, int idx
)
1032 struct object_id oid
;
1033 enum get_oid_result ret
= get_oid_1(r
, name
, len
, &oid
,
1034 GET_OID_COMMITTISH
);
1035 struct commit
*commit
;
1036 struct commit_list
*p
;
1040 commit
= lookup_commit_reference(r
, &oid
);
1041 if (parse_commit(commit
))
1042 return MISSING_OBJECT
;
1044 oidcpy(result
, &commit
->object
.oid
);
1047 p
= commit
->parents
;
1050 oidcpy(result
, &p
->item
->object
.oid
);
1055 return MISSING_OBJECT
;
1058 static enum get_oid_result
get_nth_ancestor(struct repository
*r
,
1059 const char *name
, int len
,
1060 struct object_id
*result
,
1063 struct object_id oid
;
1064 struct commit
*commit
;
1067 ret
= get_oid_1(r
, name
, len
, &oid
, GET_OID_COMMITTISH
);
1070 commit
= lookup_commit_reference(r
, &oid
);
1072 return MISSING_OBJECT
;
1074 while (generation
--) {
1075 if (parse_commit(commit
) || !commit
->parents
)
1076 return MISSING_OBJECT
;
1077 commit
= commit
->parents
->item
;
1079 oidcpy(result
, &commit
->object
.oid
);
1083 struct object
*repo_peel_to_type(struct repository
*r
, const char *name
, int namelen
,
1084 struct object
*o
, enum object_type expected_type
)
1086 if (name
&& !namelen
)
1087 namelen
= strlen(name
);
1089 if (!o
|| (!o
->parsed
&& !parse_object(r
, &o
->oid
)))
1091 if (expected_type
== OBJ_ANY
|| o
->type
== expected_type
)
1093 if (o
->type
== OBJ_TAG
)
1094 o
= ((struct tag
*) o
)->tagged
;
1095 else if (o
->type
== OBJ_COMMIT
)
1096 o
= &(repo_get_commit_tree(r
, ((struct commit
*)o
))->object
);
1099 error("%.*s: expected %s type, but the object "
1100 "dereferences to %s type",
1101 namelen
, name
, type_name(expected_type
),
1102 type_name(o
->type
));
1108 static int peel_onion(struct repository
*r
, const char *name
, int len
,
1109 struct object_id
*oid
, unsigned lookup_flags
)
1111 struct object_id outer
;
1113 unsigned int expected_type
= 0;
1117 * "ref^{type}" dereferences ref repeatedly until you cannot
1118 * dereference anymore, or you get an object of given type,
1119 * whichever comes first. "ref^{}" means just dereference
1120 * tags until you get a non-tag. "ref^0" is a shorthand for
1121 * "ref^{commit}". "commit^{tree}" could be used to find the
1122 * top-level tree of the given commit.
1124 if (len
< 4 || name
[len
-1] != '}')
1127 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
1129 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
1135 sp
++; /* beginning of type name, or closing brace for empty */
1136 if (starts_with(sp
, "commit}"))
1137 expected_type
= OBJ_COMMIT
;
1138 else if (starts_with(sp
, "tag}"))
1139 expected_type
= OBJ_TAG
;
1140 else if (starts_with(sp
, "tree}"))
1141 expected_type
= OBJ_TREE
;
1142 else if (starts_with(sp
, "blob}"))
1143 expected_type
= OBJ_BLOB
;
1144 else if (starts_with(sp
, "object}"))
1145 expected_type
= OBJ_ANY
;
1146 else if (sp
[0] == '}')
1147 expected_type
= OBJ_NONE
;
1148 else if (sp
[0] == '/')
1149 expected_type
= OBJ_COMMIT
;
1153 lookup_flags
&= ~GET_OID_DISAMBIGUATORS
;
1154 if (expected_type
== OBJ_COMMIT
)
1155 lookup_flags
|= GET_OID_COMMITTISH
;
1156 else if (expected_type
== OBJ_TREE
)
1157 lookup_flags
|= GET_OID_TREEISH
;
1159 if (get_oid_1(r
, name
, sp
- name
- 2, &outer
, lookup_flags
))
1162 o
= parse_object(r
, &outer
);
1165 if (!expected_type
) {
1166 o
= deref_tag(r
, o
, name
, sp
- name
- 2);
1167 if (!o
|| (!o
->parsed
&& !parse_object(r
, &o
->oid
)))
1169 oidcpy(oid
, &o
->oid
);
1174 * At this point, the syntax look correct, so
1175 * if we do not get the needed object, we should
1178 o
= repo_peel_to_type(r
, name
, len
, o
, expected_type
);
1182 oidcpy(oid
, &o
->oid
);
1184 /* "$commit^{/foo}" */
1187 struct commit_list
*list
= NULL
;
1190 * $commit^{/}. Some regex implementation may reject.
1191 * We don't need regex anyway. '' pattern always matches.
1196 prefix
= xstrndup(sp
+ 1, name
+ len
- 1 - (sp
+ 1));
1197 commit_list_insert((struct commit
*)o
, &list
);
1198 ret
= get_oid_oneline(r
, prefix
, oid
, list
);
1205 static int get_describe_name(struct repository
*r
,
1206 const char *name
, int len
,
1207 struct object_id
*oid
)
1210 unsigned flags
= GET_OID_QUIETLY
| GET_OID_COMMIT
;
1212 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
1214 if (!isxdigit(ch
)) {
1215 /* We must be looking at g in "SOMETHING-g"
1216 * for it to be describe output.
1218 if (ch
== 'g' && cp
[-1] == '-') {
1221 return get_short_oid(r
,
1222 cp
, len
, oid
, flags
);
1229 static enum get_oid_result
get_oid_1(struct repository
*r
,
1230 const char *name
, int len
,
1231 struct object_id
*oid
,
1232 unsigned lookup_flags
)
1234 int ret
, has_suffix
;
1238 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
1241 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
1243 if ('0' <= ch
&& ch
<= '9')
1245 if (ch
== '~' || ch
== '^')
1251 unsigned int num
= 0;
1252 int len1
= cp
- name
;
1254 while (cp
< name
+ len
) {
1255 unsigned int digit
= *cp
++ - '0';
1256 if (unsigned_mult_overflows(num
, 10))
1257 return MISSING_OBJECT
;
1259 if (unsigned_add_overflows(num
, digit
))
1260 return MISSING_OBJECT
;
1263 if (!num
&& len1
== len
- 1)
1265 else if (num
> INT_MAX
)
1266 return MISSING_OBJECT
;
1267 if (has_suffix
== '^')
1268 return get_parent(r
, name
, len1
, oid
, num
);
1269 /* else if (has_suffix == '~') -- goes without saying */
1270 return get_nth_ancestor(r
, name
, len1
, oid
, num
);
1273 ret
= peel_onion(r
, name
, len
, oid
, lookup_flags
);
1277 ret
= get_oid_basic(r
, name
, len
, oid
, lookup_flags
);
1281 /* It could be describe output that is "SOMETHING-gXXXX" */
1282 ret
= get_describe_name(r
, name
, len
, oid
);
1286 return get_short_oid(r
, name
, len
, oid
, lookup_flags
);
1290 * This interprets names like ':/Initial revision of "git"' by searching
1291 * through history and returning the first commit whose message starts
1292 * the given regular expression.
1294 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1296 * For a literal '!' character at the beginning of a pattern, you have to repeat
1297 * that, like: ':/!!foo'
1299 * For future extension, all other sequences beginning with ':/!' are reserved.
1302 /* Remember to update object flag allocation in object.h */
1303 #define ONELINE_SEEN (1u<<20)
1305 struct handle_one_ref_cb
{
1306 struct repository
*repo
;
1307 struct commit_list
**list
;
1310 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1314 struct handle_one_ref_cb
*cb
= cb_data
;
1315 struct commit_list
**list
= cb
->list
;
1316 struct object
*object
= parse_object(cb
->repo
, oid
);
1319 if (object
->type
== OBJ_TAG
) {
1320 object
= deref_tag(cb
->repo
, object
, path
,
1325 if (object
->type
!= OBJ_COMMIT
)
1327 commit_list_insert((struct commit
*)object
, list
);
1331 static int get_oid_oneline(struct repository
*r
,
1332 const char *prefix
, struct object_id
*oid
,
1333 struct commit_list
*list
)
1335 struct commit_list
*backup
= NULL
, *l
;
1340 if (prefix
[0] == '!') {
1343 if (prefix
[0] == '-') {
1346 } else if (prefix
[0] != '!') {
1351 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
1354 for (l
= list
; l
; l
= l
->next
) {
1355 l
->item
->object
.flags
|= ONELINE_SEEN
;
1356 commit_list_insert(l
->item
, &backup
);
1359 const char *p
, *buf
;
1360 struct commit
*commit
;
1363 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
1364 if (!parse_object(r
, &commit
->object
.oid
))
1366 buf
= get_commit_buffer(commit
, NULL
);
1367 p
= strstr(buf
, "\n\n");
1368 matches
= negative
^ (p
&& !regexec(®ex
, p
+ 2, 0, NULL
, 0));
1369 unuse_commit_buffer(commit
, buf
);
1372 oidcpy(oid
, &commit
->object
.oid
);
1378 free_commit_list(list
);
1379 for (l
= backup
; l
; l
= l
->next
)
1380 clear_commit_marks(l
->item
, ONELINE_SEEN
);
1381 free_commit_list(backup
);
1382 return found
? 0 : -1;
1385 struct grab_nth_branch_switch_cbdata
{
1390 static int grab_nth_branch_switch(struct object_id
*ooid UNUSED
,
1391 struct object_id
*noid UNUSED
,
1392 const char *email UNUSED
,
1393 timestamp_t timestamp UNUSED
,
1395 const char *message
, void *cb_data
)
1397 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
1398 const char *match
= NULL
, *target
= NULL
;
1401 if (skip_prefix(message
, "checkout: moving from ", &match
))
1402 target
= strstr(match
, " to ");
1404 if (!match
|| !target
)
1406 if (--(cb
->remaining
) == 0) {
1407 len
= target
- match
;
1408 strbuf_reset(cb
->sb
);
1409 strbuf_add(cb
->sb
, match
, len
);
1410 return 1; /* we are done */
1416 * Parse @{-N} syntax, return the number of characters parsed
1417 * if successful; otherwise signal an error with negative value.
1419 static int interpret_nth_prior_checkout(struct repository
*r
,
1420 const char *name
, int namelen
,
1425 struct grab_nth_branch_switch_cbdata cb
;
1431 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
1433 brace
= memchr(name
, '}', namelen
);
1436 nth
= strtol(name
+ 3, &num_end
, 10);
1437 if (num_end
!= brace
)
1444 retval
= refs_for_each_reflog_ent_reverse(get_main_ref_store(r
),
1445 "HEAD", grab_nth_branch_switch
, &cb
);
1447 retval
= brace
- name
+ 1;
1454 int repo_get_oid_mb(struct repository
*r
,
1456 struct object_id
*oid
)
1458 struct commit
*one
, *two
;
1459 struct commit_list
*mbs
;
1460 struct object_id oid_tmp
;
1464 dots
= strstr(name
, "...");
1466 return repo_get_oid(r
, name
, oid
);
1468 st
= repo_get_oid(r
, "HEAD", &oid_tmp
);
1471 strbuf_init(&sb
, dots
- name
);
1472 strbuf_add(&sb
, name
, dots
- name
);
1473 st
= repo_get_oid_committish(r
, sb
.buf
, &oid_tmp
);
1474 strbuf_release(&sb
);
1478 one
= lookup_commit_reference_gently(r
, &oid_tmp
, 0);
1482 if (repo_get_oid_committish(r
, dots
[3] ? (dots
+ 3) : "HEAD", &oid_tmp
))
1484 two
= lookup_commit_reference_gently(r
, &oid_tmp
, 0);
1487 mbs
= repo_get_merge_bases(r
, one
, two
);
1488 if (!mbs
|| mbs
->next
)
1492 oidcpy(oid
, &mbs
->item
->object
.oid
);
1494 free_commit_list(mbs
);
1498 /* parse @something syntax, when 'something' is not {.*} */
1499 static int interpret_empty_at(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1503 if (len
|| name
[1] == '{')
1506 /* make sure it's a single @, or @@{.*}, not @foo */
1507 next
= memchr(name
+ len
+ 1, '@', namelen
- len
- 1);
1508 if (next
&& next
[1] != '{')
1511 next
= name
+ namelen
;
1512 if (next
!= name
+ 1)
1516 strbuf_add(buf
, "HEAD", 4);
1520 static int reinterpret(struct repository
*r
,
1521 const char *name
, int namelen
, int len
,
1522 struct strbuf
*buf
, unsigned allowed
)
1524 /* we have extra data, which might need further processing */
1525 struct strbuf tmp
= STRBUF_INIT
;
1526 int used
= buf
->len
;
1528 struct interpret_branch_name_options options
= {
1532 strbuf_add(buf
, name
+ len
, namelen
- len
);
1533 ret
= repo_interpret_branch_name(r
, buf
->buf
, buf
->len
, &tmp
, &options
);
1534 /* that data was not interpreted, remove our cruft */
1536 strbuf_setlen(buf
, used
);
1540 strbuf_addbuf(buf
, &tmp
);
1541 strbuf_release(&tmp
);
1542 /* tweak for size of {-N} versus expanded ref name */
1543 return ret
- used
+ len
;
1546 static void set_shortened_ref(struct repository
*r
, struct strbuf
*buf
, const char *ref
)
1548 char *s
= refs_shorten_unambiguous_ref(get_main_ref_store(r
), ref
, 0);
1550 strbuf_addstr(buf
, s
);
1554 static int branch_interpret_allowed(const char *refname
, unsigned allowed
)
1559 if ((allowed
& INTERPRET_BRANCH_LOCAL
) &&
1560 starts_with(refname
, "refs/heads/"))
1562 if ((allowed
& INTERPRET_BRANCH_REMOTE
) &&
1563 starts_with(refname
, "refs/remotes/"))
1569 static int interpret_branch_mark(struct repository
*r
,
1570 const char *name
, int namelen
,
1571 int at
, struct strbuf
*buf
,
1572 int (*get_mark
)(const char *, int),
1573 const char *(*get_data
)(struct branch
*,
1575 const struct interpret_branch_name_options
*options
)
1578 struct branch
*branch
;
1579 struct strbuf err
= STRBUF_INIT
;
1582 len
= get_mark(name
+ at
, namelen
- at
);
1586 if (memchr(name
, ':', at
))
1590 char *name_str
= xmemdupz(name
, at
);
1591 branch
= branch_get(name_str
);
1594 branch
= branch_get(NULL
);
1596 value
= get_data(branch
, &err
);
1598 if (options
->nonfatal_dangling_mark
) {
1599 strbuf_release(&err
);
1606 if (!branch_interpret_allowed(value
, options
->allowed
))
1609 set_shortened_ref(r
, buf
, value
);
1613 int repo_interpret_branch_name(struct repository
*r
,
1614 const char *name
, int namelen
,
1616 const struct interpret_branch_name_options
*options
)
1623 namelen
= strlen(name
);
1625 if (!options
->allowed
|| (options
->allowed
& INTERPRET_BRANCH_LOCAL
)) {
1626 len
= interpret_nth_prior_checkout(r
, name
, namelen
, buf
);
1628 return len
; /* syntax Ok, not enough switches */
1629 } else if (len
> 0) {
1631 return len
; /* consumed all */
1633 return reinterpret(r
, name
, namelen
, len
, buf
,
1639 (at
= memchr(start
, '@', namelen
- (start
- name
)));
1642 if (!options
->allowed
|| (options
->allowed
& INTERPRET_BRANCH_HEAD
)) {
1643 len
= interpret_empty_at(name
, namelen
, at
- name
, buf
);
1645 return reinterpret(r
, name
, namelen
, len
, buf
,
1649 len
= interpret_branch_mark(r
, name
, namelen
, at
- name
, buf
,
1650 upstream_mark
, branch_get_upstream
,
1655 len
= interpret_branch_mark(r
, name
, namelen
, at
- name
, buf
,
1656 push_mark
, branch_get_push
,
1665 void strbuf_branchname(struct strbuf
*sb
, const char *name
, unsigned allowed
)
1667 int len
= strlen(name
);
1668 struct interpret_branch_name_options options
= {
1671 int used
= interpret_branch_name(name
, len
, sb
, &options
);
1675 strbuf_add(sb
, name
+ used
, len
- used
);
1678 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
1680 if (startup_info
->have_repository
)
1681 strbuf_branchname(sb
, name
, INTERPRET_BRANCH_LOCAL
);
1683 strbuf_addstr(sb
, name
);
1686 * This splice must be done even if we end up rejecting the
1687 * name; builtin/branch.c::copy_or_rename_branch() still wants
1688 * to see what the name expanded to so that "branch -m" can be
1689 * used as a tool to correct earlier mistakes.
1691 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
1694 !strcmp(sb
->buf
, "refs/heads/HEAD"))
1697 return check_refname_format(sb
->buf
, 0);
1701 * This is like "get_oid_basic()", except it allows "object ID expressions",
1702 * notably "xyz^" for "parent of xyz"
1704 int repo_get_oid(struct repository
*r
, const char *name
, struct object_id
*oid
)
1706 struct object_context unused
;
1707 return get_oid_with_context(r
, name
, 0, oid
, &unused
);
1711 * This returns a non-zero value if the string (built using printf
1712 * format and the given arguments) is not a valid object.
1714 int get_oidf(struct object_id
*oid
, const char *fmt
, ...)
1718 struct strbuf sb
= STRBUF_INIT
;
1721 strbuf_vaddf(&sb
, fmt
, ap
);
1724 ret
= get_oid(sb
.buf
, oid
);
1725 strbuf_release(&sb
);
1731 * Many callers know that the user meant to name a commit-ish by
1732 * syntactical positions where the object name appears. Calling this
1733 * function allows the machinery to disambiguate shorter-than-unique
1734 * abbreviated object names between commit-ish and others.
1736 * Note that this does NOT error out when the named object is not a
1737 * commit-ish. It is merely to give a hint to the disambiguation
1740 int repo_get_oid_committish(struct repository
*r
,
1742 struct object_id
*oid
)
1744 struct object_context unused
;
1745 return get_oid_with_context(r
, name
, GET_OID_COMMITTISH
,
1749 int repo_get_oid_treeish(struct repository
*r
,
1751 struct object_id
*oid
)
1753 struct object_context unused
;
1754 return get_oid_with_context(r
, name
, GET_OID_TREEISH
,
1758 int repo_get_oid_commit(struct repository
*r
,
1760 struct object_id
*oid
)
1762 struct object_context unused
;
1763 return get_oid_with_context(r
, name
, GET_OID_COMMIT
,
1767 int repo_get_oid_tree(struct repository
*r
,
1769 struct object_id
*oid
)
1771 struct object_context unused
;
1772 return get_oid_with_context(r
, name
, GET_OID_TREE
,
1776 int repo_get_oid_blob(struct repository
*r
,
1778 struct object_id
*oid
)
1780 struct object_context unused
;
1781 return get_oid_with_context(r
, name
, GET_OID_BLOB
,
1785 /* Must be called only when object_name:filename doesn't exist. */
1786 static void diagnose_invalid_oid_path(struct repository
*r
,
1788 const char *filename
,
1789 const struct object_id
*tree_oid
,
1790 const char *object_name
,
1791 int object_name_len
)
1793 struct object_id oid
;
1794 unsigned short mode
;
1799 if (file_exists(filename
))
1800 die(_("path '%s' exists on disk, but not in '%.*s'"),
1801 filename
, object_name_len
, object_name
);
1802 if (is_missing_file_error(errno
)) {
1803 char *fullname
= xstrfmt("%s%s", prefix
, filename
);
1805 if (!get_tree_entry(r
, tree_oid
, fullname
, &oid
, &mode
)) {
1806 die(_("path '%s' exists, but not '%s'\n"
1807 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
1810 object_name_len
, object_name
,
1812 object_name_len
, object_name
,
1815 die(_("path '%s' does not exist in '%.*s'"),
1816 filename
, object_name_len
, object_name
);
1820 /* Must be called only when :stage:filename doesn't exist. */
1821 static void diagnose_invalid_index_path(struct repository
*r
,
1824 const char *filename
)
1826 struct index_state
*istate
= r
->index
;
1827 const struct cache_entry
*ce
;
1829 unsigned namelen
= strlen(filename
);
1830 struct strbuf fullname
= STRBUF_INIT
;
1835 /* Wrong stage number? */
1836 pos
= index_name_pos(istate
, filename
, namelen
);
1839 if (pos
< istate
->cache_nr
) {
1840 ce
= istate
->cache
[pos
];
1841 if (!S_ISSPARSEDIR(ce
->ce_mode
) &&
1842 ce_namelen(ce
) == namelen
&&
1843 !memcmp(ce
->name
, filename
, namelen
))
1844 die(_("path '%s' is in the index, but not at stage %d\n"
1845 "hint: Did you mean ':%d:%s'?"),
1847 ce_stage(ce
), filename
);
1850 /* Confusion between relative and absolute filenames? */
1851 strbuf_addstr(&fullname
, prefix
);
1852 strbuf_addstr(&fullname
, filename
);
1853 pos
= index_name_pos(istate
, fullname
.buf
, fullname
.len
);
1856 if (pos
< istate
->cache_nr
) {
1857 ce
= istate
->cache
[pos
];
1858 if (!S_ISSPARSEDIR(ce
->ce_mode
) &&
1859 ce_namelen(ce
) == fullname
.len
&&
1860 !memcmp(ce
->name
, fullname
.buf
, fullname
.len
))
1861 die(_("path '%s' is in the index, but not '%s'\n"
1862 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
1863 fullname
.buf
, filename
,
1864 ce_stage(ce
), fullname
.buf
,
1865 ce_stage(ce
), filename
);
1868 if (repo_file_exists(r
, filename
))
1869 die(_("path '%s' exists on disk, but not in the index"), filename
);
1870 if (is_missing_file_error(errno
))
1871 die(_("path '%s' does not exist (neither on disk nor in the index)"),
1874 strbuf_release(&fullname
);
1878 static char *resolve_relative_path(struct repository
*r
, const char *rel
)
1880 if (!starts_with(rel
, "./") && !starts_with(rel
, "../"))
1883 if (r
!= the_repository
|| !is_inside_work_tree())
1884 die(_("relative path syntax can't be used outside working tree"));
1886 /* die() inside prefix_path() if resolved path is outside worktree */
1887 return prefix_path(startup_info
->prefix
,
1888 startup_info
->prefix
? strlen(startup_info
->prefix
) : 0,
1892 static int reject_tree_in_index(struct repository
*repo
,
1894 const struct cache_entry
*ce
,
1899 if (!S_ISSPARSEDIR(ce
->ce_mode
))
1902 diagnose_invalid_index_path(repo
, stage
, prefix
, cp
);
1906 static enum get_oid_result
get_oid_with_context_1(struct repository
*repo
,
1910 struct object_id
*oid
,
1911 struct object_context
*oc
)
1913 int ret
, bracket_depth
;
1914 int namelen
= strlen(name
);
1916 int only_to_die
= flags
& GET_OID_ONLY_TO_DIE
;
1918 memset(oc
, 0, sizeof(*oc
));
1919 oc
->mode
= S_IFINVALID
;
1920 strbuf_init(&oc
->symlink_path
, 0);
1921 ret
= get_oid_1(repo
, name
, namelen
, oid
, flags
);
1922 if (!ret
&& flags
& GET_OID_REQUIRE_PATH
)
1923 die(_("<object>:<path> required, only <object> '%s' given"),
1928 * tree:path --> object name of path in tree
1929 * :path -> object name of absolute path in index
1930 * :./path -> object name of path relative to cwd in index
1931 * :[0-3]:path -> object name of path in index at stage
1932 * :/foo -> recent commit matching foo
1934 if (name
[0] == ':') {
1936 const struct cache_entry
*ce
;
1937 char *new_path
= NULL
;
1939 if (!only_to_die
&& namelen
> 2 && name
[1] == '/') {
1940 struct handle_one_ref_cb cb
;
1941 struct commit_list
*list
= NULL
;
1945 refs_for_each_ref(get_main_ref_store(repo
), handle_one_ref
, &cb
);
1946 refs_head_ref(get_main_ref_store(repo
), handle_one_ref
, &cb
);
1947 commit_list_sort_by_date(&list
);
1948 return get_oid_oneline(repo
, name
+ 2, oid
, list
);
1952 name
[1] < '0' || '3' < name
[1])
1955 stage
= name
[1] - '0';
1958 new_path
= resolve_relative_path(repo
, cp
);
1960 namelen
= namelen
- (cp
- name
);
1963 namelen
= strlen(cp
);
1966 if (flags
& GET_OID_RECORD_PATH
)
1967 oc
->path
= xstrdup(cp
);
1969 if (!repo
->index
|| !repo
->index
->cache
)
1970 repo_read_index(repo
);
1971 pos
= index_name_pos(repo
->index
, cp
, namelen
);
1974 while (pos
< repo
->index
->cache_nr
) {
1975 ce
= repo
->index
->cache
[pos
];
1976 if (ce_namelen(ce
) != namelen
||
1977 memcmp(ce
->name
, cp
, namelen
))
1979 if (ce_stage(ce
) == stage
) {
1981 if (reject_tree_in_index(repo
, only_to_die
, ce
,
1984 oidcpy(oid
, &ce
->oid
);
1985 oc
->mode
= ce
->ce_mode
;
1990 if (only_to_die
&& name
[1] && name
[1] != '/')
1991 diagnose_invalid_index_path(repo
, stage
, prefix
, cp
);
1995 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
1998 else if (bracket_depth
&& *cp
== '}')
2000 else if (!bracket_depth
&& *cp
== ':')
2004 struct object_id tree_oid
;
2005 int len
= cp
- name
;
2006 unsigned sub_flags
= flags
;
2008 sub_flags
&= ~GET_OID_DISAMBIGUATORS
;
2009 sub_flags
|= GET_OID_TREEISH
;
2011 if (!get_oid_1(repo
, name
, len
, &tree_oid
, sub_flags
)) {
2012 const char *filename
= cp
+1;
2013 char *new_filename
= NULL
;
2015 new_filename
= resolve_relative_path(repo
, filename
);
2017 filename
= new_filename
;
2018 if (flags
& GET_OID_FOLLOW_SYMLINKS
) {
2019 ret
= get_tree_entry_follow_symlinks(repo
, &tree_oid
,
2020 filename
, oid
, &oc
->symlink_path
,
2023 ret
= get_tree_entry(repo
, &tree_oid
, filename
, oid
,
2025 if (ret
&& only_to_die
) {
2026 diagnose_invalid_oid_path(repo
, prefix
,
2032 if (flags
& GET_OID_RECORD_PATH
)
2033 oc
->path
= xstrdup(filename
);
2039 die(_("invalid object name '%.*s'."), len
, name
);
2046 * Call this function when you know "name" given by the end user must
2047 * name an object but it doesn't; the function _may_ die with a better
2048 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
2049 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
2050 * you have a chance to diagnose the error further.
2052 void maybe_die_on_misspelt_object_name(struct repository
*r
,
2056 struct object_context oc
;
2057 struct object_id oid
;
2058 get_oid_with_context_1(r
, name
, GET_OID_ONLY_TO_DIE
| GET_OID_QUIETLY
,
2062 enum get_oid_result
get_oid_with_context(struct repository
*repo
,
2065 struct object_id
*oid
,
2066 struct object_context
*oc
)
2068 if (flags
& GET_OID_FOLLOW_SYMLINKS
&& flags
& GET_OID_ONLY_TO_DIE
)
2069 BUG("incompatible flags for get_oid_with_context");
2070 return get_oid_with_context_1(repo
, str
, flags
, NULL
, oid
, oc
);