10 static int get_sha1_oneline(const char *, unsigned char *, struct commit_list
*);
12 typedef int (*disambiguate_hint_fn
)(const unsigned char *, void *);
14 struct disambiguate_state
{
15 disambiguate_hint_fn fn
;
17 unsigned char candidate
[20];
18 unsigned candidate_exists
:1;
19 unsigned candidate_checked
:1;
20 unsigned candidate_ok
:1;
21 unsigned disambiguate_fn_used
:1;
23 unsigned always_call_fn
:1;
26 static void update_candidates(struct disambiguate_state
*ds
, const unsigned char *current
)
28 if (ds
->always_call_fn
) {
29 ds
->ambiguous
= ds
->fn(current
, ds
->cb_data
) ? 1 : 0;
32 if (!ds
->candidate_exists
) {
33 /* this is the first candidate */
34 hashcpy(ds
->candidate
, current
);
35 ds
->candidate_exists
= 1;
37 } else if (!hashcmp(ds
->candidate
, current
)) {
38 /* the same as what we already have seen */
43 /* cannot disambiguate between ds->candidate and current */
48 if (!ds
->candidate_checked
) {
49 ds
->candidate_ok
= ds
->fn(ds
->candidate
, ds
->cb_data
);
50 ds
->disambiguate_fn_used
= 1;
51 ds
->candidate_checked
= 1;
54 if (!ds
->candidate_ok
) {
55 /* discard the candidate; we know it does not satisfy fn */
56 hashcpy(ds
->candidate
, current
);
57 ds
->candidate_checked
= 0;
61 /* if we reach this point, we know ds->candidate satisfies fn */
62 if (ds
->fn(current
, ds
->cb_data
)) {
64 * if both current and candidate satisfy fn, we cannot
71 /* otherwise, current can be discarded and candidate is still good */
74 static void find_short_object_filename(int len
, const char *hex_pfx
, struct disambiguate_state
*ds
)
76 struct alternate_object_database
*alt
;
78 static struct alternate_object_database
*fakeent
;
82 * Create a "fake" alternate object database that
83 * points to our own object database, to make it
84 * easier to get a temporary working space in
85 * alt->name/alt->base while iterating over the
86 * object databases including our own.
88 const char *objdir
= get_object_directory();
89 int objdir_len
= strlen(objdir
);
90 int entlen
= objdir_len
+ 43;
91 fakeent
= xmalloc(sizeof(*fakeent
) + entlen
);
92 memcpy(fakeent
->base
, objdir
, objdir_len
);
93 fakeent
->name
= fakeent
->base
+ objdir_len
+ 1;
94 fakeent
->name
[-1] = '/';
96 fakeent
->next
= alt_odb_list
;
98 sprintf(hex
, "%.2s", hex_pfx
);
99 for (alt
= fakeent
; alt
&& !ds
->ambiguous
; alt
= alt
->next
) {
102 sprintf(alt
->name
, "%.2s/", hex_pfx
);
103 dir
= opendir(alt
->base
);
107 while (!ds
->ambiguous
&& (de
= readdir(dir
)) != NULL
) {
108 unsigned char sha1
[20];
110 if (strlen(de
->d_name
) != 38)
112 if (memcmp(de
->d_name
, hex_pfx
+ 2, len
- 2))
114 memcpy(hex
+ 2, de
->d_name
, 38);
115 if (!get_sha1_hex(hex
, sha1
))
116 update_candidates(ds
, sha1
);
122 static int match_sha(unsigned len
, const unsigned char *a
, const unsigned char *b
)
132 if ((*a
^ *b
) & 0xf0)
137 static void unique_in_pack(int len
,
138 const unsigned char *bin_pfx
,
139 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(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(len
, bin_pfx
, current
))
175 update_candidates(ds
, current
);
179 static void find_short_packed_object(int len
, const unsigned char *bin_pfx
,
180 struct disambiguate_state
*ds
)
182 struct packed_git
*p
;
184 prepare_packed_git();
185 for (p
= packed_git
; p
&& !ds
->ambiguous
; p
= p
->next
)
186 unique_in_pack(len
, bin_pfx
, p
, ds
);
189 #define SHORT_NAME_NOT_FOUND (-1)
190 #define SHORT_NAME_AMBIGUOUS (-2)
192 static int finish_object_disambiguation(struct disambiguate_state
*ds
,
196 return SHORT_NAME_AMBIGUOUS
;
198 if (!ds
->candidate_exists
)
199 return SHORT_NAME_NOT_FOUND
;
201 if (!ds
->candidate_checked
)
203 * If this is the only candidate, there is no point
204 * calling the disambiguation hint callback.
206 * On the other hand, if the current candidate
207 * replaced an earlier candidate that did _not_ pass
208 * the disambiguation hint callback, then we do have
209 * more than one objects that match the short name
210 * given, so we should make sure this one matches;
211 * otherwise, if we discovered this one and the one
212 * that we previously discarded in the reverse order,
213 * we would end up showing different results in the
216 ds
->candidate_ok
= (!ds
->disambiguate_fn_used
||
217 ds
->fn(ds
->candidate
, ds
->cb_data
));
219 if (!ds
->candidate_ok
)
220 return SHORT_NAME_AMBIGUOUS
;
222 hashcpy(sha1
, ds
->candidate
);
226 static int disambiguate_commit_only(const unsigned char *sha1
, void *cb_data_unused
)
228 int kind
= sha1_object_info(sha1
, NULL
);
229 return kind
== OBJ_COMMIT
;
232 static int disambiguate_committish_only(const unsigned char *sha1
, void *cb_data_unused
)
237 kind
= sha1_object_info(sha1
, NULL
);
238 if (kind
== OBJ_COMMIT
)
243 /* We need to do this the hard way... */
244 obj
= deref_tag(parse_object(sha1
), NULL
, 0);
245 if (obj
&& obj
->type
== OBJ_COMMIT
)
250 static int disambiguate_tree_only(const unsigned char *sha1
, void *cb_data_unused
)
252 int kind
= sha1_object_info(sha1
, NULL
);
253 return kind
== OBJ_TREE
;
256 static int disambiguate_treeish_only(const unsigned char *sha1
, void *cb_data_unused
)
261 kind
= sha1_object_info(sha1
, NULL
);
262 if (kind
== OBJ_TREE
|| kind
== OBJ_COMMIT
)
267 /* We need to do this the hard way... */
268 obj
= deref_tag(lookup_object(sha1
), NULL
, 0);
269 if (obj
&& (obj
->type
== OBJ_TREE
|| obj
->type
== OBJ_COMMIT
))
274 static int disambiguate_blob_only(const unsigned char *sha1
, void *cb_data_unused
)
276 int kind
= sha1_object_info(sha1
, NULL
);
277 return kind
== OBJ_BLOB
;
280 static int prepare_prefixes(const char *name
, int len
,
281 unsigned char *bin_pfx
,
287 memset(hex_pfx
, 'x', 40);
288 for (i
= 0; i
< len
;i
++) {
289 unsigned char c
= name
[i
];
291 if (c
>= '0' && c
<= '9')
293 else if (c
>= 'a' && c
<= 'f')
295 else if (c
>= 'A' && c
<='F') {
304 bin_pfx
[i
>> 1] |= val
;
309 static int get_short_sha1(const char *name
, int len
, unsigned char *sha1
,
314 unsigned char bin_pfx
[20];
315 struct disambiguate_state ds
;
316 int quietly
= !!(flags
& GET_SHA1_QUIETLY
);
318 if (len
< MINIMUM_ABBREV
|| len
> 40)
320 if (prepare_prefixes(name
, len
, bin_pfx
, hex_pfx
) < 0)
325 memset(&ds
, 0, sizeof(ds
));
326 if (flags
& GET_SHA1_COMMIT
)
327 ds
.fn
= disambiguate_commit_only
;
328 else if (flags
& GET_SHA1_COMMITTISH
)
329 ds
.fn
= disambiguate_committish_only
;
330 else if (flags
& GET_SHA1_TREE
)
331 ds
.fn
= disambiguate_tree_only
;
332 else if (flags
& GET_SHA1_TREEISH
)
333 ds
.fn
= disambiguate_treeish_only
;
334 else if (flags
& GET_SHA1_BLOB
)
335 ds
.fn
= disambiguate_blob_only
;
337 find_short_object_filename(len
, hex_pfx
, &ds
);
338 find_short_packed_object(len
, bin_pfx
, &ds
);
339 status
= finish_object_disambiguation(&ds
, sha1
);
341 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
))
342 return error("short SHA1 %.*s is ambiguous.", len
, hex_pfx
);
347 int for_each_abbrev(const char *prefix
, each_abbrev_fn fn
, void *cb_data
)
350 unsigned char bin_pfx
[20];
351 struct disambiguate_state ds
;
352 int len
= strlen(prefix
);
354 if (len
< MINIMUM_ABBREV
|| len
> 40)
356 if (prepare_prefixes(prefix
, len
, bin_pfx
, hex_pfx
) < 0)
361 memset(&ds
, 0, sizeof(ds
));
362 ds
.always_call_fn
= 1;
363 ds
.cb_data
= cb_data
;
366 find_short_object_filename(len
, hex_pfx
, &ds
);
367 find_short_packed_object(len
, bin_pfx
, &ds
);
371 const char *find_unique_abbrev(const unsigned char *sha1
, int len
)
376 exists
= has_sha1_file(sha1
);
377 memcpy(hex
, sha1_to_hex(sha1
), 40);
378 if (len
== 40 || !len
)
381 unsigned char sha1_ret
[20];
382 status
= get_short_sha1(hex
, len
, sha1_ret
, GET_SHA1_QUIETLY
);
385 : status
== SHORT_NAME_NOT_FOUND
) {
394 static int ambiguous_path(const char *path
, int len
)
399 for (cnt
= 0; cnt
< len
; cnt
++) {
419 static inline int upstream_mark(const char *string
, int len
)
421 const char *suffix
[] = { "@{upstream}", "@{u}" };
424 for (i
= 0; i
< ARRAY_SIZE(suffix
); i
++) {
425 int suffix_len
= strlen(suffix
[i
]);
426 if (suffix_len
<= len
427 && !memcmp(string
, suffix
[i
], suffix_len
))
433 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
, unsigned lookup_flags
);
434 static int interpret_nth_prior_checkout(const char *name
, struct strbuf
*buf
);
436 static int get_sha1_basic(const char *str
, int len
, unsigned char *sha1
)
438 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
439 static const char *object_name_msg
= N_(
440 "Git normally never creates a ref that ends with 40 hex characters\n"
441 "because it will be ignored when you just specify 40-hex. These refs\n"
442 "may be created by mistake. For example,\n"
444 " git checkout -b $br $(git rev-parse ...)\n"
446 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
447 "examine these refs and maybe delete them. Turn this message off by\n"
448 "running \"git config advice.objectNameWarning false\"");
449 unsigned char tmp_sha1
[20];
450 char *real_ref
= NULL
;
452 int at
, reflog_len
, nth_prior
= 0;
454 if (len
== 40 && !get_sha1_hex(str
, sha1
)) {
455 if (warn_on_object_refname_ambiguity
) {
456 refs_found
= dwim_ref(str
, len
, tmp_sha1
, &real_ref
);
457 if (refs_found
> 0 && warn_ambiguous_refs
) {
458 warning(warn_msg
, len
, str
);
459 if (advice_object_name_warning
)
460 fprintf(stderr
, "%s\n", _(object_name_msg
));
467 /* basic@{time or number or -number} format to query ref-log */
469 if (len
&& str
[len
-1] == '}') {
470 for (at
= len
-4; at
>= 0; at
--) {
471 if (str
[at
] == '@' && str
[at
+1] == '{') {
472 if (str
[at
+2] == '-') {
474 /* @{-N} not at start */
479 if (!upstream_mark(str
+ at
, len
- at
)) {
480 reflog_len
= (len
-1) - (at
+2);
488 /* Accept only unambiguous ref paths. */
489 if (len
&& ambiguous_path(str
, len
))
493 struct strbuf buf
= STRBUF_INIT
;
496 if (interpret_nth_prior_checkout(str
, &buf
) > 0) {
497 detached
= (buf
.len
== 40 && !get_sha1_hex(buf
.buf
, sha1
));
498 strbuf_release(&buf
);
504 if (!len
&& reflog_len
)
505 /* allow "@{...}" to mean the current branch reflog */
506 refs_found
= dwim_ref("HEAD", 4, sha1
, &real_ref
);
508 refs_found
= dwim_log(str
, len
, sha1
, &real_ref
);
510 refs_found
= dwim_ref(str
, len
, sha1
, &real_ref
);
515 if (warn_ambiguous_refs
&&
517 !get_short_sha1(str
, len
, tmp_sha1
, GET_SHA1_QUIETLY
)))
518 warning(warn_msg
, len
, str
);
522 unsigned long at_time
;
523 unsigned long co_time
;
526 /* Is it asking for N-th entry, or approxidate? */
527 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
528 char ch
= str
[at
+2+i
];
529 if ('0' <= ch
&& ch
<= '9')
530 nth
= nth
* 10 + ch
- '0';
534 if (100000000 <= nth
) {
541 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
542 at_time
= approxidate_careful(tmp
, &errors
);
547 if (read_ref_at(real_ref
, at_time
, nth
, sha1
, NULL
,
548 &co_time
, &co_tz
, &co_cnt
)) {
550 if (!prefixcmp(real_ref
, "refs/heads/")) {
552 len
= strlen(real_ref
+ 11);
560 warning("Log for '%.*s' only goes "
561 "back to %s.", len
, str
,
562 show_date(co_time
, co_tz
, DATE_RFC2822
));
564 die("Log for '%.*s' only has %d entries.",
574 static int get_parent(const char *name
, int len
,
575 unsigned char *result
, int idx
)
577 unsigned char sha1
[20];
578 int ret
= get_sha1_1(name
, len
, sha1
, GET_SHA1_COMMITTISH
);
579 struct commit
*commit
;
580 struct commit_list
*p
;
584 commit
= lookup_commit_reference(sha1
);
587 if (parse_commit(commit
))
590 hashcpy(result
, commit
->object
.sha1
);
596 hashcpy(result
, p
->item
->object
.sha1
);
604 static int get_nth_ancestor(const char *name
, int len
,
605 unsigned char *result
, int generation
)
607 unsigned char sha1
[20];
608 struct commit
*commit
;
611 ret
= get_sha1_1(name
, len
, sha1
, GET_SHA1_COMMITTISH
);
614 commit
= lookup_commit_reference(sha1
);
618 while (generation
--) {
619 if (parse_commit(commit
) || !commit
->parents
)
621 commit
= commit
->parents
->item
;
623 hashcpy(result
, commit
->object
.sha1
);
627 struct object
*peel_to_type(const char *name
, int namelen
,
628 struct object
*o
, enum object_type expected_type
)
630 if (name
&& !namelen
)
631 namelen
= strlen(name
);
633 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
635 if (expected_type
== OBJ_ANY
|| o
->type
== expected_type
)
637 if (o
->type
== OBJ_TAG
)
638 o
= ((struct tag
*) o
)->tagged
;
639 else if (o
->type
== OBJ_COMMIT
)
640 o
= &(((struct commit
*) o
)->tree
->object
);
643 error("%.*s: expected %s type, but the object "
644 "dereferences to %s type",
645 namelen
, name
, typename(expected_type
),
652 static int peel_onion(const char *name
, int len
, unsigned char *sha1
)
654 unsigned char outer
[20];
656 unsigned int expected_type
= 0;
657 unsigned lookup_flags
= 0;
661 * "ref^{type}" dereferences ref repeatedly until you cannot
662 * dereference anymore, or you get an object of given type,
663 * whichever comes first. "ref^{}" means just dereference
664 * tags until you get a non-tag. "ref^0" is a shorthand for
665 * "ref^{commit}". "commit^{tree}" could be used to find the
666 * top-level tree of the given commit.
668 if (len
< 4 || name
[len
-1] != '}')
671 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
673 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
679 sp
++; /* beginning of type name, or closing brace for empty */
680 if (!prefixcmp(sp
, "commit}"))
681 expected_type
= OBJ_COMMIT
;
682 else if (!prefixcmp(sp
, "tag}"))
683 expected_type
= OBJ_TAG
;
684 else if (!prefixcmp(sp
, "tree}"))
685 expected_type
= OBJ_TREE
;
686 else if (!prefixcmp(sp
, "blob}"))
687 expected_type
= OBJ_BLOB
;
688 else if (!prefixcmp(sp
, "object}"))
689 expected_type
= OBJ_ANY
;
690 else if (sp
[0] == '}')
691 expected_type
= OBJ_NONE
;
692 else if (sp
[0] == '/')
693 expected_type
= OBJ_COMMIT
;
697 if (expected_type
== OBJ_COMMIT
)
698 lookup_flags
= GET_SHA1_COMMITTISH
;
699 else if (expected_type
== OBJ_TREE
)
700 lookup_flags
= GET_SHA1_TREEISH
;
702 if (get_sha1_1(name
, sp
- name
- 2, outer
, lookup_flags
))
705 o
= parse_object(outer
);
708 if (!expected_type
) {
709 o
= deref_tag(o
, name
, sp
- name
- 2);
710 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
712 hashcpy(sha1
, o
->sha1
);
717 * At this point, the syntax look correct, so
718 * if we do not get the needed object, we should
721 o
= peel_to_type(name
, len
, o
, expected_type
);
725 hashcpy(sha1
, o
->sha1
);
727 /* "$commit^{/foo}" */
730 struct commit_list
*list
= NULL
;
733 * $commit^{/}. Some regex implementation may reject.
734 * We don't need regex anyway. '' pattern always matches.
739 prefix
= xstrndup(sp
+ 1, name
+ len
- 1 - (sp
+ 1));
740 commit_list_insert((struct commit
*)o
, &list
);
741 ret
= get_sha1_oneline(prefix
, sha1
, list
);
748 static int get_describe_name(const char *name
, int len
, unsigned char *sha1
)
751 unsigned flags
= GET_SHA1_QUIETLY
| GET_SHA1_COMMIT
;
753 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
755 if (hexval(ch
) & ~0377) {
756 /* We must be looking at g in "SOMETHING-g"
757 * for it to be describe output.
759 if (ch
== 'g' && cp
[-1] == '-') {
762 return get_short_sha1(cp
, len
, sha1
, flags
);
769 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
, unsigned lookup_flags
)
775 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
778 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
780 if ('0' <= ch
&& ch
<= '9')
782 if (ch
== '~' || ch
== '^')
789 int len1
= cp
- name
;
791 while (cp
< name
+ len
)
792 num
= num
* 10 + *cp
++ - '0';
793 if (!num
&& len1
== len
- 1)
795 if (has_suffix
== '^')
796 return get_parent(name
, len1
, sha1
, num
);
797 /* else if (has_suffix == '~') -- goes without saying */
798 return get_nth_ancestor(name
, len1
, sha1
, num
);
801 ret
= peel_onion(name
, len
, sha1
);
805 ret
= get_sha1_basic(name
, len
, sha1
);
809 /* It could be describe output that is "SOMETHING-gXXXX" */
810 ret
= get_describe_name(name
, len
, sha1
);
814 return get_short_sha1(name
, len
, sha1
, lookup_flags
);
818 * This interprets names like ':/Initial revision of "git"' by searching
819 * through history and returning the first commit whose message starts
820 * the given regular expression.
822 * For future extension, ':/!' is reserved. If you want to match a message
823 * beginning with a '!', you have to repeat the exclamation mark.
825 #define ONELINE_SEEN (1u<<20)
827 static int handle_one_ref(const char *path
,
828 const unsigned char *sha1
, int flag
, void *cb_data
)
830 struct commit_list
**list
= cb_data
;
831 struct object
*object
= parse_object(sha1
);
834 if (object
->type
== OBJ_TAG
) {
835 object
= deref_tag(object
, path
, strlen(path
));
839 if (object
->type
!= OBJ_COMMIT
)
841 commit_list_insert_by_date((struct commit
*)object
, list
);
845 static int get_sha1_oneline(const char *prefix
, unsigned char *sha1
,
846 struct commit_list
*list
)
848 struct commit_list
*backup
= NULL
, *l
;
852 if (prefix
[0] == '!') {
853 if (prefix
[1] != '!')
854 die ("Invalid search pattern: %s", prefix
);
858 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
859 die("Invalid search pattern: %s", prefix
);
861 for (l
= list
; l
; l
= l
->next
) {
862 l
->item
->object
.flags
|= ONELINE_SEEN
;
863 commit_list_insert(l
->item
, &backup
);
866 char *p
, *to_free
= NULL
;
867 struct commit
*commit
;
868 enum object_type type
;
872 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
873 if (!parse_object(commit
->object
.sha1
))
878 p
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
884 p
= strstr(p
, "\n\n");
885 matches
= p
&& !regexec(®ex
, p
+ 2, 0, NULL
, 0);
889 hashcpy(sha1
, commit
->object
.sha1
);
895 free_commit_list(list
);
896 for (l
= backup
; l
; l
= l
->next
)
897 clear_commit_marks(l
->item
, ONELINE_SEEN
);
898 free_commit_list(backup
);
899 return found
? 0 : -1;
902 struct grab_nth_branch_switch_cbdata
{
907 static int grab_nth_branch_switch(unsigned char *osha1
, unsigned char *nsha1
,
908 const char *email
, unsigned long timestamp
, int tz
,
909 const char *message
, void *cb_data
)
911 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
912 const char *match
= NULL
, *target
= NULL
;
915 if (!prefixcmp(message
, "checkout: moving from ")) {
916 match
= message
+ strlen("checkout: moving from ");
917 target
= strstr(match
, " to ");
920 if (!match
|| !target
)
922 if (--(cb
->remaining
) == 0) {
923 len
= target
- match
;
924 strbuf_reset(&cb
->buf
);
925 strbuf_add(&cb
->buf
, match
, len
);
926 return 1; /* we are done */
932 * Parse @{-N} syntax, return the number of characters parsed
933 * if successful; otherwise signal an error with negative value.
935 static int interpret_nth_prior_checkout(const char *name
, struct strbuf
*buf
)
939 struct grab_nth_branch_switch_cbdata cb
;
943 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
945 brace
= strchr(name
, '}');
948 nth
= strtol(name
+ 3, &num_end
, 10);
949 if (num_end
!= brace
)
954 strbuf_init(&cb
.buf
, 20);
957 if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch
, &cb
)) {
959 strbuf_add(buf
, cb
.buf
.buf
, cb
.buf
.len
);
960 retval
= brace
- name
+ 1;
963 strbuf_release(&cb
.buf
);
967 int get_sha1_mb(const char *name
, unsigned char *sha1
)
969 struct commit
*one
, *two
;
970 struct commit_list
*mbs
;
971 unsigned char sha1_tmp
[20];
975 dots
= strstr(name
, "...");
977 return get_sha1(name
, sha1
);
979 st
= get_sha1("HEAD", sha1_tmp
);
982 strbuf_init(&sb
, dots
- name
);
983 strbuf_add(&sb
, name
, dots
- name
);
984 st
= get_sha1_committish(sb
.buf
, sha1_tmp
);
989 one
= lookup_commit_reference_gently(sha1_tmp
, 0);
993 if (get_sha1_committish(dots
[3] ? (dots
+ 3) : "HEAD", sha1_tmp
))
995 two
= lookup_commit_reference_gently(sha1_tmp
, 0);
998 mbs
= get_merge_bases(one
, two
, 1);
999 if (!mbs
|| mbs
->next
)
1003 hashcpy(sha1
, mbs
->item
->object
.sha1
);
1005 free_commit_list(mbs
);
1009 static int reinterpret(const char *name
, int namelen
, int len
, struct strbuf
*buf
)
1011 /* we have extra data, which might need further processing */
1012 struct strbuf tmp
= STRBUF_INIT
;
1013 int used
= buf
->len
;
1016 strbuf_add(buf
, name
+ len
, namelen
- len
);
1017 ret
= interpret_branch_name(buf
->buf
, &tmp
);
1018 /* that data was not interpreted, remove our cruft */
1020 strbuf_setlen(buf
, used
);
1024 strbuf_addbuf(buf
, &tmp
);
1025 strbuf_release(&tmp
);
1026 /* tweak for size of {-N} versus expanded ref name */
1027 return ret
- used
+ len
;
1031 * This reads short-hand syntax that not only evaluates to a commit
1032 * object name, but also can act as if the end user spelled the name
1033 * of the branch from the command line.
1035 * - "@{-N}" finds the name of the Nth previous branch we were on, and
1036 * places the name of the branch in the given buf and returns the
1037 * number of characters parsed if successful.
1039 * - "<branch>@{upstream}" finds the name of the other ref that
1040 * <branch> is configured to merge with (missing <branch> defaults
1041 * to the current branch), and places the name of the branch in the
1042 * given buf and returns the number of characters parsed if
1045 * If the input is not of the accepted format, it returns a negative
1046 * number to signal an error.
1048 * If the input was ok but there are not N branch switches in the
1049 * reflog, it returns 0.
1051 int interpret_branch_name(const char *name
, struct strbuf
*buf
)
1054 struct branch
*upstream
;
1055 int namelen
= strlen(name
);
1056 int len
= interpret_nth_prior_checkout(name
, buf
);
1060 return len
; /* syntax Ok, not enough switches */
1061 } else if (len
> 0) {
1063 return len
; /* consumed all */
1065 return reinterpret(name
, namelen
, len
, buf
);
1068 cp
= strchr(name
, '@');
1071 tmp_len
= upstream_mark(cp
, namelen
- (cp
- name
));
1074 len
= cp
+ tmp_len
- name
;
1075 cp
= xstrndup(name
, cp
- name
);
1076 upstream
= branch_get(*cp
? cp
: NULL
);
1078 * Upstream can be NULL only if cp refers to HEAD and HEAD
1079 * points to something different than a branch.
1082 die(_("HEAD does not point to a branch"));
1083 if (!upstream
->merge
|| !upstream
->merge
[0]->dst
) {
1084 if (!ref_exists(upstream
->refname
))
1085 die(_("No such branch: '%s'"), cp
);
1086 if (!upstream
->merge
) {
1087 die(_("No upstream configured for branch '%s'"),
1091 _("Upstream branch '%s' not stored as a remote-tracking branch"),
1092 upstream
->merge
[0]->src
);
1095 cp
= shorten_unambiguous_ref(upstream
->merge
[0]->dst
, 0);
1097 strbuf_addstr(buf
, cp
);
1102 int strbuf_branchname(struct strbuf
*sb
, const char *name
)
1104 int len
= strlen(name
);
1105 int used
= interpret_branch_name(name
, sb
);
1111 strbuf_add(sb
, name
+ used
, len
- used
);
1115 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
1117 strbuf_branchname(sb
, name
);
1120 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
1121 return check_refname_format(sb
->buf
, 0);
1125 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
1126 * notably "xyz^" for "parent of xyz"
1128 int get_sha1(const char *name
, unsigned char *sha1
)
1130 struct object_context unused
;
1131 return get_sha1_with_context(name
, 0, sha1
, &unused
);
1135 * Many callers know that the user meant to name a commit-ish by
1136 * syntactical positions where the object name appears. Calling this
1137 * function allows the machinery to disambiguate shorter-than-unique
1138 * abbreviated object names between commit-ish and others.
1140 * Note that this does NOT error out when the named object is not a
1141 * commit-ish. It is merely to give a hint to the disambiguation
1144 int get_sha1_committish(const char *name
, unsigned char *sha1
)
1146 struct object_context unused
;
1147 return get_sha1_with_context(name
, GET_SHA1_COMMITTISH
,
1151 int get_sha1_treeish(const char *name
, unsigned char *sha1
)
1153 struct object_context unused
;
1154 return get_sha1_with_context(name
, GET_SHA1_TREEISH
,
1158 int get_sha1_commit(const char *name
, unsigned char *sha1
)
1160 struct object_context unused
;
1161 return get_sha1_with_context(name
, GET_SHA1_COMMIT
,
1165 int get_sha1_tree(const char *name
, unsigned char *sha1
)
1167 struct object_context unused
;
1168 return get_sha1_with_context(name
, GET_SHA1_TREE
,
1172 int get_sha1_blob(const char *name
, unsigned char *sha1
)
1174 struct object_context unused
;
1175 return get_sha1_with_context(name
, GET_SHA1_BLOB
,
1179 /* Must be called only when object_name:filename doesn't exist. */
1180 static void diagnose_invalid_sha1_path(const char *prefix
,
1181 const char *filename
,
1182 const unsigned char *tree_sha1
,
1183 const char *object_name
,
1184 int object_name_len
)
1187 unsigned char sha1
[20];
1193 if (!lstat(filename
, &st
))
1194 die("Path '%s' exists on disk, but not in '%.*s'.",
1195 filename
, object_name_len
, object_name
);
1196 if (errno
== ENOENT
|| errno
== ENOTDIR
) {
1197 char *fullname
= xmalloc(strlen(filename
)
1198 + strlen(prefix
) + 1);
1199 strcpy(fullname
, prefix
);
1200 strcat(fullname
, filename
);
1202 if (!get_tree_entry(tree_sha1
, fullname
,
1204 die("Path '%s' exists, but not '%s'.\n"
1205 "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
1208 object_name_len
, object_name
,
1210 object_name_len
, object_name
,
1213 die("Path '%s' does not exist in '%.*s'",
1214 filename
, object_name_len
, object_name
);
1218 /* Must be called only when :stage:filename doesn't exist. */
1219 static void diagnose_invalid_index_path(int stage
,
1221 const char *filename
)
1224 const struct cache_entry
*ce
;
1226 unsigned namelen
= strlen(filename
);
1227 unsigned fullnamelen
;
1233 /* Wrong stage number? */
1234 pos
= cache_name_pos(filename
, namelen
);
1237 if (pos
< active_nr
) {
1238 ce
= active_cache
[pos
];
1239 if (ce_namelen(ce
) == namelen
&&
1240 !memcmp(ce
->name
, filename
, namelen
))
1241 die("Path '%s' is in the index, but not at stage %d.\n"
1242 "Did you mean ':%d:%s'?",
1244 ce_stage(ce
), filename
);
1247 /* Confusion between relative and absolute filenames? */
1248 fullnamelen
= namelen
+ strlen(prefix
);
1249 fullname
= xmalloc(fullnamelen
+ 1);
1250 strcpy(fullname
, prefix
);
1251 strcat(fullname
, filename
);
1252 pos
= cache_name_pos(fullname
, fullnamelen
);
1255 if (pos
< active_nr
) {
1256 ce
= active_cache
[pos
];
1257 if (ce_namelen(ce
) == fullnamelen
&&
1258 !memcmp(ce
->name
, fullname
, fullnamelen
))
1259 die("Path '%s' is in the index, but not '%s'.\n"
1260 "Did you mean ':%d:%s' aka ':%d:./%s'?",
1262 ce_stage(ce
), fullname
,
1263 ce_stage(ce
), filename
);
1266 if (!lstat(filename
, &st
))
1267 die("Path '%s' exists on disk, but not in the index.", filename
);
1268 if (errno
== ENOENT
|| errno
== ENOTDIR
)
1269 die("Path '%s' does not exist (neither on disk nor in the index).",
1276 static char *resolve_relative_path(const char *rel
)
1278 if (prefixcmp(rel
, "./") && prefixcmp(rel
, "../"))
1282 die("BUG: startup_info struct is not initialized.");
1284 if (!is_inside_work_tree())
1285 die("relative path syntax can't be used outside working tree.");
1287 /* die() inside prefix_path() if resolved path is outside worktree */
1288 return prefix_path(startup_info
->prefix
,
1289 startup_info
->prefix
? strlen(startup_info
->prefix
) : 0,
1293 static int get_sha1_with_context_1(const char *name
,
1296 unsigned char *sha1
,
1297 struct object_context
*oc
)
1299 int ret
, bracket_depth
;
1300 int namelen
= strlen(name
);
1302 int only_to_die
= flags
& GET_SHA1_ONLY_TO_DIE
;
1304 memset(oc
, 0, sizeof(*oc
));
1305 oc
->mode
= S_IFINVALID
;
1306 ret
= get_sha1_1(name
, namelen
, sha1
, flags
);
1310 * sha1:path --> object name of path in ent sha1
1311 * :path -> object name of absolute path in index
1312 * :./path -> object name of path relative to cwd in index
1313 * :[0-3]:path -> object name of path in index at stage
1314 * :/foo -> recent commit matching foo
1316 if (name
[0] == ':') {
1318 const struct cache_entry
*ce
;
1319 char *new_path
= NULL
;
1321 if (!only_to_die
&& namelen
> 2 && name
[1] == '/') {
1322 struct commit_list
*list
= NULL
;
1323 for_each_ref(handle_one_ref
, &list
);
1324 return get_sha1_oneline(name
+ 2, sha1
, list
);
1328 name
[1] < '0' || '3' < name
[1])
1331 stage
= name
[1] - '0';
1334 new_path
= resolve_relative_path(cp
);
1336 namelen
= namelen
- (cp
- name
);
1339 namelen
= strlen(cp
);
1342 strncpy(oc
->path
, cp
,
1344 oc
->path
[sizeof(oc
->path
)-1] = '\0';
1348 pos
= cache_name_pos(cp
, namelen
);
1351 while (pos
< active_nr
) {
1352 ce
= active_cache
[pos
];
1353 if (ce_namelen(ce
) != namelen
||
1354 memcmp(ce
->name
, cp
, namelen
))
1356 if (ce_stage(ce
) == stage
) {
1357 hashcpy(sha1
, ce
->sha1
);
1358 oc
->mode
= ce
->ce_mode
;
1364 if (only_to_die
&& name
[1] && name
[1] != '/')
1365 diagnose_invalid_index_path(stage
, prefix
, cp
);
1369 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
1372 else if (bracket_depth
&& *cp
== '}')
1374 else if (!bracket_depth
&& *cp
== ':')
1378 unsigned char tree_sha1
[20];
1379 int len
= cp
- name
;
1380 if (!get_sha1_1(name
, len
, tree_sha1
, GET_SHA1_TREEISH
)) {
1381 const char *filename
= cp
+1;
1382 char *new_filename
= NULL
;
1384 new_filename
= resolve_relative_path(filename
);
1386 filename
= new_filename
;
1387 ret
= get_tree_entry(tree_sha1
, filename
, sha1
, &oc
->mode
);
1388 if (ret
&& only_to_die
) {
1389 diagnose_invalid_sha1_path(prefix
, filename
,
1393 hashcpy(oc
->tree
, tree_sha1
);
1394 strncpy(oc
->path
, filename
,
1396 oc
->path
[sizeof(oc
->path
)-1] = '\0';
1402 die("Invalid object name '%.*s'.", len
, name
);
1409 * Call this function when you know "name" given by the end user must
1410 * name an object but it doesn't; the function _may_ die with a better
1411 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1412 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1413 * you have a chance to diagnose the error further.
1415 void maybe_die_on_misspelt_object_name(const char *name
, const char *prefix
)
1417 struct object_context oc
;
1418 unsigned char sha1
[20];
1419 get_sha1_with_context_1(name
, GET_SHA1_ONLY_TO_DIE
, prefix
, sha1
, &oc
);
1422 int get_sha1_with_context(const char *str
, unsigned flags
, unsigned char *sha1
, struct object_context
*orc
)
1424 return get_sha1_with_context_1(str
, flags
, NULL
, sha1
, orc
);