10 #include "sha1-array.h"
12 static int get_sha1_oneline(const char *, unsigned char *, struct commit_list
*);
14 typedef int (*disambiguate_hint_fn
)(const unsigned char *, void *);
16 struct disambiguate_state
{
17 int len
; /* length of prefix in hex chars */
18 char hex_pfx
[GIT_SHA1_HEXSZ
+ 1];
19 unsigned char bin_pfx
[GIT_SHA1_RAWSZ
];
21 disambiguate_hint_fn fn
;
23 unsigned char candidate
[GIT_SHA1_RAWSZ
];
24 unsigned candidate_exists
:1;
25 unsigned candidate_checked
:1;
26 unsigned candidate_ok
:1;
27 unsigned disambiguate_fn_used
:1;
29 unsigned always_call_fn
:1;
32 static void update_candidates(struct disambiguate_state
*ds
, const unsigned char *current
)
34 if (ds
->always_call_fn
) {
35 ds
->ambiguous
= ds
->fn(current
, ds
->cb_data
) ? 1 : 0;
38 if (!ds
->candidate_exists
) {
39 /* this is the first candidate */
40 hashcpy(ds
->candidate
, current
);
41 ds
->candidate_exists
= 1;
43 } else if (!hashcmp(ds
->candidate
, current
)) {
44 /* the same as what we already have seen */
49 /* cannot disambiguate between ds->candidate and current */
54 if (!ds
->candidate_checked
) {
55 ds
->candidate_ok
= ds
->fn(ds
->candidate
, ds
->cb_data
);
56 ds
->disambiguate_fn_used
= 1;
57 ds
->candidate_checked
= 1;
60 if (!ds
->candidate_ok
) {
61 /* discard the candidate; we know it does not satisfy fn */
62 hashcpy(ds
->candidate
, current
);
63 ds
->candidate_checked
= 0;
67 /* if we reach this point, we know ds->candidate satisfies fn */
68 if (ds
->fn(current
, ds
->cb_data
)) {
70 * if both current and candidate satisfy fn, we cannot
77 /* otherwise, current can be discarded and candidate is still good */
80 static void find_short_object_filename(struct disambiguate_state
*ds
)
82 struct alternate_object_database
*alt
;
83 char hex
[GIT_SHA1_HEXSZ
];
84 static struct alternate_object_database
*fakeent
;
88 * Create a "fake" alternate object database that
89 * points to our own object database, to make it
90 * easier to get a temporary working space in
91 * alt->name/alt->base while iterating over the
92 * object databases including our own.
94 fakeent
= alloc_alt_odb(get_object_directory());
96 fakeent
->next
= alt_odb_list
;
98 xsnprintf(hex
, sizeof(hex
), "%.2s", ds
->hex_pfx
);
99 for (alt
= fakeent
; alt
&& !ds
->ambiguous
; alt
= alt
->next
) {
100 struct strbuf
*buf
= alt_scratch_buf(alt
);
104 strbuf_addf(buf
, "%.2s/", ds
->hex_pfx
);
105 dir
= opendir(buf
->buf
);
109 while (!ds
->ambiguous
&& (de
= readdir(dir
)) != NULL
) {
110 unsigned char sha1
[20];
112 if (strlen(de
->d_name
) != 38)
114 if (memcmp(de
->d_name
, ds
->hex_pfx
+ 2, ds
->len
- 2))
116 memcpy(hex
+ 2, de
->d_name
, 38);
117 if (!get_sha1_hex(hex
, sha1
))
118 update_candidates(ds
, sha1
);
124 static int match_sha(unsigned len
, const unsigned char *a
, const unsigned char *b
)
134 if ((*a
^ *b
) & 0xf0)
139 static void unique_in_pack(struct packed_git
*p
,
140 struct disambiguate_state
*ds
)
142 uint32_t num
, last
, i
, first
= 0;
143 const unsigned char *current
= NULL
;
146 num
= p
->num_objects
;
148 while (first
< last
) {
149 uint32_t mid
= (first
+ last
) / 2;
150 const unsigned char *current
;
153 current
= nth_packed_object_sha1(p
, mid
);
154 cmp
= hashcmp(ds
->bin_pfx
, current
);
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 current
= nth_packed_object_sha1(p
, i
);
173 if (!match_sha(ds
->len
, ds
->bin_pfx
, current
))
175 update_candidates(ds
, current
);
179 static void find_short_packed_object(struct disambiguate_state
*ds
)
181 struct packed_git
*p
;
183 prepare_packed_git();
184 for (p
= packed_git
; p
&& !ds
->ambiguous
; p
= p
->next
)
185 unique_in_pack(p
, ds
);
188 #define SHORT_NAME_NOT_FOUND (-1)
189 #define SHORT_NAME_AMBIGUOUS (-2)
191 static int finish_object_disambiguation(struct disambiguate_state
*ds
,
195 return SHORT_NAME_AMBIGUOUS
;
197 if (!ds
->candidate_exists
)
198 return SHORT_NAME_NOT_FOUND
;
200 if (!ds
->candidate_checked
)
202 * If this is the only candidate, there is no point
203 * calling the disambiguation hint callback.
205 * On the other hand, if the current candidate
206 * replaced an earlier candidate that did _not_ pass
207 * the disambiguation hint callback, then we do have
208 * more than one objects that match the short name
209 * given, so we should make sure this one matches;
210 * otherwise, if we discovered this one and the one
211 * that we previously discarded in the reverse order,
212 * we would end up showing different results in the
215 ds
->candidate_ok
= (!ds
->disambiguate_fn_used
||
216 ds
->fn(ds
->candidate
, ds
->cb_data
));
218 if (!ds
->candidate_ok
)
219 return SHORT_NAME_AMBIGUOUS
;
221 hashcpy(sha1
, ds
->candidate
);
225 static int disambiguate_commit_only(const unsigned char *sha1
, void *cb_data_unused
)
227 int kind
= sha1_object_info(sha1
, NULL
);
228 return kind
== OBJ_COMMIT
;
231 static int disambiguate_committish_only(const unsigned char *sha1
, void *cb_data_unused
)
236 kind
= sha1_object_info(sha1
, NULL
);
237 if (kind
== OBJ_COMMIT
)
242 /* We need to do this the hard way... */
243 obj
= deref_tag(parse_object(sha1
), NULL
, 0);
244 if (obj
&& obj
->type
== OBJ_COMMIT
)
249 static int disambiguate_tree_only(const unsigned char *sha1
, void *cb_data_unused
)
251 int kind
= sha1_object_info(sha1
, NULL
);
252 return kind
== OBJ_TREE
;
255 static int disambiguate_treeish_only(const unsigned char *sha1
, void *cb_data_unused
)
260 kind
= sha1_object_info(sha1
, NULL
);
261 if (kind
== OBJ_TREE
|| kind
== OBJ_COMMIT
)
266 /* We need to do this the hard way... */
267 obj
= deref_tag(parse_object(sha1
), NULL
, 0);
268 if (obj
&& (obj
->type
== OBJ_TREE
|| obj
->type
== OBJ_COMMIT
))
273 static int disambiguate_blob_only(const unsigned char *sha1
, void *cb_data_unused
)
275 int kind
= sha1_object_info(sha1
, NULL
);
276 return kind
== OBJ_BLOB
;
279 static disambiguate_hint_fn default_disambiguate_hint
;
281 int set_disambiguate_hint_config(const char *var
, const char *value
)
283 static const struct {
285 disambiguate_hint_fn fn
;
288 { "commit", disambiguate_commit_only
},
289 { "committish", disambiguate_committish_only
},
290 { "tree", disambiguate_tree_only
},
291 { "treeish", disambiguate_treeish_only
},
292 { "blob", disambiguate_blob_only
}
297 return config_error_nonbool(var
);
299 for (i
= 0; i
< ARRAY_SIZE(hints
); i
++) {
300 if (!strcasecmp(value
, hints
[i
].name
)) {
301 default_disambiguate_hint
= hints
[i
].fn
;
306 return error("unknown hint type for '%s': %s", var
, value
);
309 static int init_object_disambiguation(const char *name
, int len
,
310 struct disambiguate_state
*ds
)
314 if (len
< MINIMUM_ABBREV
|| len
> GIT_SHA1_HEXSZ
)
317 memset(ds
, 0, sizeof(*ds
));
319 for (i
= 0; i
< len
;i
++) {
320 unsigned char c
= name
[i
];
322 if (c
>= '0' && c
<= '9')
324 else if (c
>= 'a' && c
<= 'f')
326 else if (c
>= 'A' && c
<='F') {
335 ds
->bin_pfx
[i
>> 1] |= val
;
339 ds
->hex_pfx
[len
] = '\0';
344 static int show_ambiguous_object(const unsigned char *sha1
, void *data
)
346 const struct disambiguate_state
*ds
= data
;
347 struct strbuf desc
= STRBUF_INIT
;
350 if (ds
->fn
&& !ds
->fn(sha1
, ds
->cb_data
))
353 type
= sha1_object_info(sha1
, NULL
);
354 if (type
== OBJ_COMMIT
) {
355 struct commit
*commit
= lookup_commit(sha1
);
357 struct pretty_print_context pp
= {0};
358 pp
.date_mode
.type
= DATE_SHORT
;
359 format_commit_message(commit
, " %ad - %s", &desc
, &pp
);
361 } else if (type
== OBJ_TAG
) {
362 struct tag
*tag
= lookup_tag(sha1
);
363 if (!parse_tag(tag
) && tag
->tag
)
364 strbuf_addf(&desc
, " %s", tag
->tag
);
368 find_unique_abbrev(sha1
, DEFAULT_ABBREV
),
369 typename(type
) ? typename(type
) : "unknown type",
372 strbuf_release(&desc
);
376 static int get_short_sha1(const char *name
, int len
, unsigned char *sha1
,
380 struct disambiguate_state ds
;
381 int quietly
= !!(flags
& GET_SHA1_QUIETLY
);
383 if (init_object_disambiguation(name
, len
, &ds
) < 0)
386 if (HAS_MULTI_BITS(flags
& GET_SHA1_DISAMBIGUATORS
))
387 die("BUG: multiple get_short_sha1 disambiguator flags");
389 if (flags
& GET_SHA1_COMMIT
)
390 ds
.fn
= disambiguate_commit_only
;
391 else if (flags
& GET_SHA1_COMMITTISH
)
392 ds
.fn
= disambiguate_committish_only
;
393 else if (flags
& GET_SHA1_TREE
)
394 ds
.fn
= disambiguate_tree_only
;
395 else if (flags
& GET_SHA1_TREEISH
)
396 ds
.fn
= disambiguate_treeish_only
;
397 else if (flags
& GET_SHA1_BLOB
)
398 ds
.fn
= disambiguate_blob_only
;
400 ds
.fn
= default_disambiguate_hint
;
402 find_short_object_filename(&ds
);
403 find_short_packed_object(&ds
);
404 status
= finish_object_disambiguation(&ds
, sha1
);
406 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
)) {
407 error(_("short SHA1 %s is ambiguous"), ds
.hex_pfx
);
410 * We may still have ambiguity if we simply saw a series of
411 * candidates that did not satisfy our hint function. In
412 * that case, we still want to show them, so disable the hint
418 advise(_("The candidates are:"));
419 for_each_abbrev(ds
.hex_pfx
, show_ambiguous_object
, &ds
);
425 static int collect_ambiguous(const unsigned char *sha1
, void *data
)
427 sha1_array_append(data
, sha1
);
431 int for_each_abbrev(const char *prefix
, each_abbrev_fn fn
, void *cb_data
)
433 struct sha1_array collect
= SHA1_ARRAY_INIT
;
434 struct disambiguate_state ds
;
437 if (init_object_disambiguation(prefix
, strlen(prefix
), &ds
) < 0)
440 ds
.always_call_fn
= 1;
441 ds
.fn
= collect_ambiguous
;
442 ds
.cb_data
= &collect
;
443 find_short_object_filename(&ds
);
444 find_short_packed_object(&ds
);
446 ret
= sha1_array_for_each_unique(&collect
, fn
, cb_data
);
447 sha1_array_clear(&collect
);
451 int find_unique_abbrev_r(char *hex
, const unsigned char *sha1
, int len
)
455 sha1_to_hex_r(hex
, sha1
);
456 if (len
== 40 || !len
)
458 exists
= has_sha1_file(sha1
);
460 unsigned char sha1_ret
[20];
461 status
= get_short_sha1(hex
, len
, sha1_ret
, GET_SHA1_QUIETLY
);
464 : status
== SHORT_NAME_NOT_FOUND
) {
473 const char *find_unique_abbrev(const unsigned char *sha1
, int len
)
475 static char hex
[GIT_SHA1_HEXSZ
+ 1];
476 find_unique_abbrev_r(hex
, sha1
, len
);
480 static int ambiguous_path(const char *path
, int len
)
485 for (cnt
= 0; cnt
< len
; cnt
++) {
505 static inline int at_mark(const char *string
, int len
,
506 const char **suffix
, int nr
)
510 for (i
= 0; i
< nr
; i
++) {
511 int suffix_len
= strlen(suffix
[i
]);
512 if (suffix_len
<= len
513 && !memcmp(string
, suffix
[i
], suffix_len
))
519 static inline int upstream_mark(const char *string
, int len
)
521 const char *suffix
[] = { "@{upstream}", "@{u}" };
522 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
525 static inline int push_mark(const char *string
, int len
)
527 const char *suffix
[] = { "@{push}" };
528 return at_mark(string
, len
, suffix
, ARRAY_SIZE(suffix
));
531 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
, unsigned lookup_flags
);
532 static int interpret_nth_prior_checkout(const char *name
, int namelen
, struct strbuf
*buf
);
534 static int get_sha1_basic(const char *str
, int len
, unsigned char *sha1
,
537 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
538 static const char *object_name_msg
= N_(
539 "Git normally never creates a ref that ends with 40 hex characters\n"
540 "because it will be ignored when you just specify 40-hex. These refs\n"
541 "may be created by mistake. For example,\n"
543 " git checkout -b $br $(git rev-parse ...)\n"
545 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
546 "examine these refs and maybe delete them. Turn this message off by\n"
547 "running \"git config advice.objectNameWarning false\"");
548 unsigned char tmp_sha1
[20];
549 char *real_ref
= NULL
;
551 int at
, reflog_len
, nth_prior
= 0;
553 if (len
== 40 && !get_sha1_hex(str
, sha1
)) {
554 if (warn_ambiguous_refs
&& warn_on_object_refname_ambiguity
) {
555 refs_found
= dwim_ref(str
, len
, tmp_sha1
, &real_ref
);
556 if (refs_found
> 0) {
557 warning(warn_msg
, len
, str
);
558 if (advice_object_name_warning
)
559 fprintf(stderr
, "%s\n", _(object_name_msg
));
566 /* basic@{time or number or -number} format to query ref-log */
568 if (len
&& str
[len
-1] == '}') {
569 for (at
= len
-4; at
>= 0; at
--) {
570 if (str
[at
] == '@' && str
[at
+1] == '{') {
571 if (str
[at
+2] == '-') {
573 /* @{-N} not at start */
578 if (!upstream_mark(str
+ at
, len
- at
) &&
579 !push_mark(str
+ at
, len
- at
)) {
580 reflog_len
= (len
-1) - (at
+2);
588 /* Accept only unambiguous ref paths. */
589 if (len
&& ambiguous_path(str
, len
))
593 struct strbuf buf
= STRBUF_INIT
;
596 if (interpret_nth_prior_checkout(str
, len
, &buf
) > 0) {
597 detached
= (buf
.len
== 40 && !get_sha1_hex(buf
.buf
, sha1
));
598 strbuf_release(&buf
);
604 if (!len
&& reflog_len
)
605 /* allow "@{...}" to mean the current branch reflog */
606 refs_found
= dwim_ref("HEAD", 4, sha1
, &real_ref
);
608 refs_found
= dwim_log(str
, len
, sha1
, &real_ref
);
610 refs_found
= dwim_ref(str
, len
, sha1
, &real_ref
);
615 if (warn_ambiguous_refs
&& !(flags
& GET_SHA1_QUIETLY
) &&
617 !get_short_sha1(str
, len
, tmp_sha1
, GET_SHA1_QUIETLY
)))
618 warning(warn_msg
, len
, str
);
622 unsigned long at_time
;
623 unsigned long co_time
;
626 /* Is it asking for N-th entry, or approxidate? */
627 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
628 char ch
= str
[at
+2+i
];
629 if ('0' <= ch
&& ch
<= '9')
630 nth
= nth
* 10 + ch
- '0';
634 if (100000000 <= nth
) {
641 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
642 at_time
= approxidate_careful(tmp
, &errors
);
649 if (read_ref_at(real_ref
, flags
, at_time
, nth
, sha1
, NULL
,
650 &co_time
, &co_tz
, &co_cnt
)) {
652 if (starts_with(real_ref
, "refs/heads/")) {
654 len
= strlen(real_ref
+ 11);
662 if (!(flags
& GET_SHA1_QUIETLY
)) {
663 warning("Log for '%.*s' only goes "
664 "back to %s.", len
, str
,
665 show_date(co_time
, co_tz
, DATE_MODE(RFC2822
)));
668 if (flags
& GET_SHA1_QUIETLY
) {
671 die("Log for '%.*s' only has %d entries.",
681 static int get_parent(const char *name
, int len
,
682 unsigned char *result
, int idx
)
684 unsigned char sha1
[20];
685 int ret
= get_sha1_1(name
, len
, sha1
, GET_SHA1_COMMITTISH
);
686 struct commit
*commit
;
687 struct commit_list
*p
;
691 commit
= lookup_commit_reference(sha1
);
692 if (parse_commit(commit
))
695 hashcpy(result
, commit
->object
.oid
.hash
);
701 hashcpy(result
, p
->item
->object
.oid
.hash
);
709 static int get_nth_ancestor(const char *name
, int len
,
710 unsigned char *result
, int generation
)
712 unsigned char sha1
[20];
713 struct commit
*commit
;
716 ret
= get_sha1_1(name
, len
, sha1
, GET_SHA1_COMMITTISH
);
719 commit
= lookup_commit_reference(sha1
);
723 while (generation
--) {
724 if (parse_commit(commit
) || !commit
->parents
)
726 commit
= commit
->parents
->item
;
728 hashcpy(result
, commit
->object
.oid
.hash
);
732 struct object
*peel_to_type(const char *name
, int namelen
,
733 struct object
*o
, enum object_type expected_type
)
735 if (name
&& !namelen
)
736 namelen
= strlen(name
);
738 if (!o
|| (!o
->parsed
&& !parse_object(o
->oid
.hash
)))
740 if (expected_type
== OBJ_ANY
|| o
->type
== expected_type
)
742 if (o
->type
== OBJ_TAG
)
743 o
= ((struct tag
*) o
)->tagged
;
744 else if (o
->type
== OBJ_COMMIT
)
745 o
= &(((struct commit
*) o
)->tree
->object
);
748 error("%.*s: expected %s type, but the object "
749 "dereferences to %s type",
750 namelen
, name
, typename(expected_type
),
757 static int peel_onion(const char *name
, int len
, unsigned char *sha1
,
758 unsigned lookup_flags
)
760 unsigned char outer
[20];
762 unsigned int expected_type
= 0;
766 * "ref^{type}" dereferences ref repeatedly until you cannot
767 * dereference anymore, or you get an object of given type,
768 * whichever comes first. "ref^{}" means just dereference
769 * tags until you get a non-tag. "ref^0" is a shorthand for
770 * "ref^{commit}". "commit^{tree}" could be used to find the
771 * top-level tree of the given commit.
773 if (len
< 4 || name
[len
-1] != '}')
776 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
778 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
784 sp
++; /* beginning of type name, or closing brace for empty */
785 if (starts_with(sp
, "commit}"))
786 expected_type
= OBJ_COMMIT
;
787 else if (starts_with(sp
, "tag}"))
788 expected_type
= OBJ_TAG
;
789 else if (starts_with(sp
, "tree}"))
790 expected_type
= OBJ_TREE
;
791 else if (starts_with(sp
, "blob}"))
792 expected_type
= OBJ_BLOB
;
793 else if (starts_with(sp
, "object}"))
794 expected_type
= OBJ_ANY
;
795 else if (sp
[0] == '}')
796 expected_type
= OBJ_NONE
;
797 else if (sp
[0] == '/')
798 expected_type
= OBJ_COMMIT
;
802 lookup_flags
&= ~GET_SHA1_DISAMBIGUATORS
;
803 if (expected_type
== OBJ_COMMIT
)
804 lookup_flags
|= GET_SHA1_COMMITTISH
;
805 else if (expected_type
== OBJ_TREE
)
806 lookup_flags
|= GET_SHA1_TREEISH
;
808 if (get_sha1_1(name
, sp
- name
- 2, outer
, lookup_flags
))
811 o
= parse_object(outer
);
814 if (!expected_type
) {
815 o
= deref_tag(o
, name
, sp
- name
- 2);
816 if (!o
|| (!o
->parsed
&& !parse_object(o
->oid
.hash
)))
818 hashcpy(sha1
, o
->oid
.hash
);
823 * At this point, the syntax look correct, so
824 * if we do not get the needed object, we should
827 o
= peel_to_type(name
, len
, o
, expected_type
);
831 hashcpy(sha1
, o
->oid
.hash
);
833 /* "$commit^{/foo}" */
836 struct commit_list
*list
= NULL
;
839 * $commit^{/}. Some regex implementation may reject.
840 * We don't need regex anyway. '' pattern always matches.
845 prefix
= xstrndup(sp
+ 1, name
+ len
- 1 - (sp
+ 1));
846 commit_list_insert((struct commit
*)o
, &list
);
847 ret
= get_sha1_oneline(prefix
, sha1
, list
);
854 static int get_describe_name(const char *name
, int len
, unsigned char *sha1
)
857 unsigned flags
= GET_SHA1_QUIETLY
| GET_SHA1_COMMIT
;
859 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
862 /* We must be looking at g in "SOMETHING-g"
863 * for it to be describe output.
865 if (ch
== 'g' && cp
[-1] == '-') {
868 return get_short_sha1(cp
, len
, sha1
, flags
);
875 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
, unsigned lookup_flags
)
881 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
884 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
886 if ('0' <= ch
&& ch
<= '9')
888 if (ch
== '~' || ch
== '^')
895 int len1
= cp
- name
;
897 while (cp
< name
+ len
)
898 num
= num
* 10 + *cp
++ - '0';
899 if (!num
&& len1
== len
- 1)
901 if (has_suffix
== '^')
902 return get_parent(name
, len1
, sha1
, num
);
903 /* else if (has_suffix == '~') -- goes without saying */
904 return get_nth_ancestor(name
, len1
, sha1
, num
);
907 ret
= peel_onion(name
, len
, sha1
, lookup_flags
);
911 ret
= get_sha1_basic(name
, len
, sha1
, lookup_flags
);
915 /* It could be describe output that is "SOMETHING-gXXXX" */
916 ret
= get_describe_name(name
, len
, sha1
);
920 return get_short_sha1(name
, len
, sha1
, lookup_flags
);
924 * This interprets names like ':/Initial revision of "git"' by searching
925 * through history and returning the first commit whose message starts
926 * the given regular expression.
928 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
930 * For a literal '!' character at the beginning of a pattern, you have to repeat
931 * that, like: ':/!!foo'
933 * For future extension, all other sequences beginning with ':/!' are reserved.
936 /* Remember to update object flag allocation in object.h */
937 #define ONELINE_SEEN (1u<<20)
939 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
940 int flag
, void *cb_data
)
942 struct commit_list
**list
= cb_data
;
943 struct object
*object
= parse_object(oid
->hash
);
946 if (object
->type
== OBJ_TAG
) {
947 object
= deref_tag(object
, path
, strlen(path
));
951 if (object
->type
!= OBJ_COMMIT
)
953 commit_list_insert((struct commit
*)object
, list
);
957 static int get_sha1_oneline(const char *prefix
, unsigned char *sha1
,
958 struct commit_list
*list
)
960 struct commit_list
*backup
= NULL
, *l
;
965 if (prefix
[0] == '!') {
968 if (prefix
[0] == '-') {
971 } else if (prefix
[0] != '!') {
976 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
979 for (l
= list
; l
; l
= l
->next
) {
980 l
->item
->object
.flags
|= ONELINE_SEEN
;
981 commit_list_insert(l
->item
, &backup
);
985 struct commit
*commit
;
988 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
989 if (!parse_object(commit
->object
.oid
.hash
))
991 buf
= get_commit_buffer(commit
, NULL
);
992 p
= strstr(buf
, "\n\n");
993 matches
= negative
^ (p
&& !regexec(®ex
, p
+ 2, 0, NULL
, 0));
994 unuse_commit_buffer(commit
, buf
);
997 hashcpy(sha1
, commit
->object
.oid
.hash
);
1003 free_commit_list(list
);
1004 for (l
= backup
; l
; l
= l
->next
)
1005 clear_commit_marks(l
->item
, ONELINE_SEEN
);
1006 free_commit_list(backup
);
1007 return found
? 0 : -1;
1010 struct grab_nth_branch_switch_cbdata
{
1015 static int grab_nth_branch_switch(unsigned char *osha1
, unsigned char *nsha1
,
1016 const char *email
, unsigned long timestamp
, int tz
,
1017 const char *message
, void *cb_data
)
1019 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
1020 const char *match
= NULL
, *target
= NULL
;
1023 if (skip_prefix(message
, "checkout: moving from ", &match
))
1024 target
= strstr(match
, " to ");
1026 if (!match
|| !target
)
1028 if (--(cb
->remaining
) == 0) {
1029 len
= target
- match
;
1030 strbuf_reset(&cb
->buf
);
1031 strbuf_add(&cb
->buf
, match
, len
);
1032 return 1; /* we are done */
1038 * Parse @{-N} syntax, return the number of characters parsed
1039 * if successful; otherwise signal an error with negative value.
1041 static int interpret_nth_prior_checkout(const char *name
, int namelen
,
1046 struct grab_nth_branch_switch_cbdata cb
;
1052 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
1054 brace
= memchr(name
, '}', namelen
);
1057 nth
= strtol(name
+ 3, &num_end
, 10);
1058 if (num_end
!= brace
)
1063 strbuf_init(&cb
.buf
, 20);
1066 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch
, &cb
)) {
1068 strbuf_addbuf(buf
, &cb
.buf
);
1069 retval
= brace
- name
+ 1;
1072 strbuf_release(&cb
.buf
);
1076 int get_oid_mb(const char *name
, struct object_id
*oid
)
1078 struct commit
*one
, *two
;
1079 struct commit_list
*mbs
;
1080 struct object_id oid_tmp
;
1084 dots
= strstr(name
, "...");
1086 return get_oid(name
, oid
);
1088 st
= get_oid("HEAD", &oid_tmp
);
1091 strbuf_init(&sb
, dots
- name
);
1092 strbuf_add(&sb
, name
, dots
- name
);
1093 st
= get_sha1_committish(sb
.buf
, oid_tmp
.hash
);
1094 strbuf_release(&sb
);
1098 one
= lookup_commit_reference_gently(oid_tmp
.hash
, 0);
1102 if (get_sha1_committish(dots
[3] ? (dots
+ 3) : "HEAD", oid_tmp
.hash
))
1104 two
= lookup_commit_reference_gently(oid_tmp
.hash
, 0);
1107 mbs
= get_merge_bases(one
, two
);
1108 if (!mbs
|| mbs
->next
)
1112 oidcpy(oid
, &mbs
->item
->object
.oid
);
1114 free_commit_list(mbs
);
1118 /* parse @something syntax, when 'something' is not {.*} */
1119 static int interpret_empty_at(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1123 if (len
|| name
[1] == '{')
1126 /* make sure it's a single @, or @@{.*}, not @foo */
1127 next
= memchr(name
+ len
+ 1, '@', namelen
- len
- 1);
1128 if (next
&& next
[1] != '{')
1131 next
= name
+ namelen
;
1132 if (next
!= name
+ 1)
1136 strbuf_add(buf
, "HEAD", 4);
1140 static int reinterpret(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1142 /* we have extra data, which might need further processing */
1143 struct strbuf tmp
= STRBUF_INIT
;
1144 int used
= buf
->len
;
1147 strbuf_add(buf
, name
+ len
, namelen
- len
);
1148 ret
= interpret_branch_name(buf
->buf
, buf
->len
, &tmp
);
1149 /* that data was not interpreted, remove our cruft */
1151 strbuf_setlen(buf
, used
);
1155 strbuf_addbuf(buf
, &tmp
);
1156 strbuf_release(&tmp
);
1157 /* tweak for size of {-N} versus expanded ref name */
1158 return ret
- used
+ len
;
1161 static void set_shortened_ref(struct strbuf
*buf
, const char *ref
)
1163 char *s
= shorten_unambiguous_ref(ref
, 0);
1165 strbuf_addstr(buf
, s
);
1169 static int interpret_branch_mark(const char *name
, int namelen
,
1170 int at
, struct strbuf
*buf
,
1171 int (*get_mark
)(const char *, int),
1172 const char *(*get_data
)(struct branch
*,
1176 struct branch
*branch
;
1177 struct strbuf err
= STRBUF_INIT
;
1180 len
= get_mark(name
+ at
, namelen
- at
);
1184 if (memchr(name
, ':', at
))
1188 char *name_str
= xmemdupz(name
, at
);
1189 branch
= branch_get(name_str
);
1192 branch
= branch_get(NULL
);
1194 value
= get_data(branch
, &err
);
1198 set_shortened_ref(buf
, value
);
1203 * This reads short-hand syntax that not only evaluates to a commit
1204 * object name, but also can act as if the end user spelled the name
1205 * of the branch from the command line.
1207 * - "@{-N}" finds the name of the Nth previous branch we were on, and
1208 * places the name of the branch in the given buf and returns the
1209 * number of characters parsed if successful.
1211 * - "<branch>@{upstream}" finds the name of the other ref that
1212 * <branch> is configured to merge with (missing <branch> defaults
1213 * to the current branch), and places the name of the branch in the
1214 * given buf and returns the number of characters parsed if
1217 * If the input is not of the accepted format, it returns a negative
1218 * number to signal an error.
1220 * If the input was ok but there are not N branch switches in the
1221 * reflog, it returns 0.
1223 int interpret_branch_name(const char *name
, int namelen
, struct strbuf
*buf
)
1227 int len
= interpret_nth_prior_checkout(name
, namelen
, buf
);
1230 namelen
= strlen(name
);
1233 return len
; /* syntax Ok, not enough switches */
1234 } else if (len
> 0) {
1236 return len
; /* consumed all */
1238 return reinterpret(name
, namelen
, len
, buf
);
1242 (at
= memchr(start
, '@', namelen
- (start
- name
)));
1245 len
= interpret_empty_at(name
, namelen
, at
- name
, buf
);
1247 return reinterpret(name
, namelen
, len
, buf
);
1249 len
= interpret_branch_mark(name
, namelen
, at
- name
, buf
,
1250 upstream_mark
, branch_get_upstream
);
1254 len
= interpret_branch_mark(name
, namelen
, at
- name
, buf
,
1255 push_mark
, branch_get_push
);
1263 int strbuf_branchname(struct strbuf
*sb
, const char *name
)
1265 int len
= strlen(name
);
1266 int used
= interpret_branch_name(name
, len
, sb
);
1272 strbuf_add(sb
, name
+ used
, len
- used
);
1276 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
1278 strbuf_branchname(sb
, name
);
1281 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
1282 return check_refname_format(sb
->buf
, 0);
1286 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1287 * notably "xyz^" for "parent of xyz"
1289 int get_sha1(const char *name
, unsigned char *sha1
)
1291 struct object_context unused
;
1292 return get_sha1_with_context(name
, 0, sha1
, &unused
);
1296 * This is like "get_sha1()", but for struct object_id.
1298 int get_oid(const char *name
, struct object_id
*oid
)
1300 return get_sha1(name
, oid
->hash
);
1305 * Many callers know that the user meant to name a commit-ish by
1306 * syntactical positions where the object name appears. Calling this
1307 * function allows the machinery to disambiguate shorter-than-unique
1308 * abbreviated object names between commit-ish and others.
1310 * Note that this does NOT error out when the named object is not a
1311 * commit-ish. It is merely to give a hint to the disambiguation
1314 int get_sha1_committish(const char *name
, unsigned char *sha1
)
1316 struct object_context unused
;
1317 return get_sha1_with_context(name
, GET_SHA1_COMMITTISH
,
1321 int get_sha1_treeish(const char *name
, unsigned char *sha1
)
1323 struct object_context unused
;
1324 return get_sha1_with_context(name
, GET_SHA1_TREEISH
,
1328 int get_sha1_commit(const char *name
, unsigned char *sha1
)
1330 struct object_context unused
;
1331 return get_sha1_with_context(name
, GET_SHA1_COMMIT
,
1335 int get_sha1_tree(const char *name
, unsigned char *sha1
)
1337 struct object_context unused
;
1338 return get_sha1_with_context(name
, GET_SHA1_TREE
,
1342 int get_sha1_blob(const char *name
, unsigned char *sha1
)
1344 struct object_context unused
;
1345 return get_sha1_with_context(name
, GET_SHA1_BLOB
,
1349 /* Must be called only when object_name:filename doesn't exist. */
1350 static void diagnose_invalid_sha1_path(const char *prefix
,
1351 const char *filename
,
1352 const unsigned char *tree_sha1
,
1353 const char *object_name
,
1354 int object_name_len
)
1356 unsigned char sha1
[20];
1362 if (file_exists(filename
))
1363 die("Path '%s' exists on disk, but not in '%.*s'.",
1364 filename
, object_name_len
, object_name
);
1365 if (errno
== ENOENT
|| errno
== ENOTDIR
) {
1366 char *fullname
= xstrfmt("%s%s", prefix
, filename
);
1368 if (!get_tree_entry(tree_sha1
, fullname
,
1370 die("Path '%s' exists, but not '%s'.\n"
1371 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
1374 object_name_len
, object_name
,
1376 object_name_len
, object_name
,
1379 die("Path '%s' does not exist in '%.*s'",
1380 filename
, object_name_len
, object_name
);
1384 /* Must be called only when :stage:filename doesn't exist. */
1385 static void diagnose_invalid_index_path(int stage
,
1387 const char *filename
)
1389 const struct cache_entry
*ce
;
1391 unsigned namelen
= strlen(filename
);
1392 struct strbuf fullname
= STRBUF_INIT
;
1397 /* Wrong stage number? */
1398 pos
= cache_name_pos(filename
, namelen
);
1401 if (pos
< active_nr
) {
1402 ce
= active_cache
[pos
];
1403 if (ce_namelen(ce
) == namelen
&&
1404 !memcmp(ce
->name
, filename
, namelen
))
1405 die("Path '%s' is in the index, but not at stage %d.\n"
1406 "Did you mean ':%d:%s'?",
1408 ce_stage(ce
), filename
);
1411 /* Confusion between relative and absolute filenames? */
1412 strbuf_addstr(&fullname
, prefix
);
1413 strbuf_addstr(&fullname
, filename
);
1414 pos
= cache_name_pos(fullname
.buf
, fullname
.len
);
1417 if (pos
< active_nr
) {
1418 ce
= active_cache
[pos
];
1419 if (ce_namelen(ce
) == fullname
.len
&&
1420 !memcmp(ce
->name
, fullname
.buf
, fullname
.len
))
1421 die("Path '%s' is in the index, but not '%s'.\n"
1422 "Did you mean ':%d:%s' aka ':%d:./%s'?",
1423 fullname
.buf
, filename
,
1424 ce_stage(ce
), fullname
.buf
,
1425 ce_stage(ce
), filename
);
1428 if (file_exists(filename
))
1429 die("Path '%s' exists on disk, but not in the index.", filename
);
1430 if (errno
== ENOENT
|| errno
== ENOTDIR
)
1431 die("Path '%s' does not exist (neither on disk nor in the index).",
1434 strbuf_release(&fullname
);
1438 static char *resolve_relative_path(const char *rel
)
1440 if (!starts_with(rel
, "./") && !starts_with(rel
, "../"))
1443 if (!is_inside_work_tree())
1444 die("relative path syntax can't be used outside working tree.");
1446 /* die() inside prefix_path() if resolved path is outside worktree */
1447 return prefix_path(startup_info
->prefix
,
1448 startup_info
->prefix
? strlen(startup_info
->prefix
) : 0,
1452 static int get_sha1_with_context_1(const char *name
,
1455 unsigned char *sha1
,
1456 struct object_context
*oc
)
1458 int ret
, bracket_depth
;
1459 int namelen
= strlen(name
);
1461 int only_to_die
= flags
& GET_SHA1_ONLY_TO_DIE
;
1464 flags
|= GET_SHA1_QUIETLY
;
1466 memset(oc
, 0, sizeof(*oc
));
1467 oc
->mode
= S_IFINVALID
;
1468 ret
= get_sha1_1(name
, namelen
, sha1
, flags
);
1472 * sha1:path --> object name of path in ent sha1
1473 * :path -> object name of absolute path in index
1474 * :./path -> object name of path relative to cwd in index
1475 * :[0-3]:path -> object name of path in index at stage
1476 * :/foo -> recent commit matching foo
1478 if (name
[0] == ':') {
1480 const struct cache_entry
*ce
;
1481 char *new_path
= NULL
;
1483 if (!only_to_die
&& namelen
> 2 && name
[1] == '/') {
1484 struct commit_list
*list
= NULL
;
1486 for_each_ref(handle_one_ref
, &list
);
1487 commit_list_sort_by_date(&list
);
1488 return get_sha1_oneline(name
+ 2, sha1
, list
);
1492 name
[1] < '0' || '3' < name
[1])
1495 stage
= name
[1] - '0';
1498 new_path
= resolve_relative_path(cp
);
1500 namelen
= namelen
- (cp
- name
);
1503 namelen
= strlen(cp
);
1506 strlcpy(oc
->path
, cp
, sizeof(oc
->path
));
1510 pos
= cache_name_pos(cp
, namelen
);
1513 while (pos
< active_nr
) {
1514 ce
= active_cache
[pos
];
1515 if (ce_namelen(ce
) != namelen
||
1516 memcmp(ce
->name
, cp
, namelen
))
1518 if (ce_stage(ce
) == stage
) {
1519 hashcpy(sha1
, ce
->oid
.hash
);
1520 oc
->mode
= ce
->ce_mode
;
1526 if (only_to_die
&& name
[1] && name
[1] != '/')
1527 diagnose_invalid_index_path(stage
, prefix
, cp
);
1531 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
1534 else if (bracket_depth
&& *cp
== '}')
1536 else if (!bracket_depth
&& *cp
== ':')
1540 unsigned char tree_sha1
[20];
1541 int len
= cp
- name
;
1542 unsigned sub_flags
= flags
;
1544 sub_flags
&= ~GET_SHA1_DISAMBIGUATORS
;
1545 sub_flags
|= GET_SHA1_TREEISH
;
1547 if (!get_sha1_1(name
, len
, tree_sha1
, sub_flags
)) {
1548 const char *filename
= cp
+1;
1549 char *new_filename
= NULL
;
1551 new_filename
= resolve_relative_path(filename
);
1553 filename
= new_filename
;
1554 if (flags
& GET_SHA1_FOLLOW_SYMLINKS
) {
1555 ret
= get_tree_entry_follow_symlinks(tree_sha1
,
1556 filename
, sha1
, &oc
->symlink_path
,
1559 ret
= get_tree_entry(tree_sha1
, filename
,
1561 if (ret
&& only_to_die
) {
1562 diagnose_invalid_sha1_path(prefix
,
1568 hashcpy(oc
->tree
, tree_sha1
);
1569 strlcpy(oc
->path
, filename
, sizeof(oc
->path
));
1575 die("Invalid object name '%.*s'.", len
, name
);
1582 * Call this function when you know "name" given by the end user must
1583 * name an object but it doesn't; the function _may_ die with a better
1584 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1585 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1586 * you have a chance to diagnose the error further.
1588 void maybe_die_on_misspelt_object_name(const char *name
, const char *prefix
)
1590 struct object_context oc
;
1591 unsigned char sha1
[20];
1592 get_sha1_with_context_1(name
, GET_SHA1_ONLY_TO_DIE
, prefix
, sha1
, &oc
);
1595 int get_sha1_with_context(const char *str
, unsigned flags
, unsigned char *sha1
, struct object_context
*orc
)
1597 if (flags
& GET_SHA1_FOLLOW_SYMLINKS
&& flags
& GET_SHA1_ONLY_TO_DIE
)
1598 die("BUG: incompatible flags for get_sha1_with_context");
1599 return get_sha1_with_context_1(str
, flags
, NULL
, sha1
, orc
);