9 static int find_short_object_filename(int len
, const char *name
, unsigned char *sha1
)
11 struct alternate_object_database
*alt
;
14 static struct alternate_object_database
*fakeent
;
17 const char *objdir
= get_object_directory();
18 int objdir_len
= strlen(objdir
);
19 int entlen
= objdir_len
+ 43;
20 fakeent
= xmalloc(sizeof(*fakeent
) + entlen
);
21 memcpy(fakeent
->base
, objdir
, objdir_len
);
22 fakeent
->name
= fakeent
->base
+ objdir_len
+ 1;
23 fakeent
->name
[-1] = '/';
25 fakeent
->next
= alt_odb_list
;
27 sprintf(hex
, "%.2s", name
);
28 for (alt
= fakeent
; alt
&& found
< 2; alt
= alt
->next
) {
31 sprintf(alt
->name
, "%.2s/", name
);
32 dir
= opendir(alt
->base
);
35 while ((de
= readdir(dir
)) != NULL
) {
36 if (strlen(de
->d_name
) != 38)
38 if (memcmp(de
->d_name
, name
+ 2, len
- 2))
41 memcpy(hex
+ 2, de
->d_name
, 38);
44 else if (memcmp(hex
+ 2, de
->d_name
, 38)) {
52 return get_sha1_hex(hex
, sha1
) == 0;
56 static int match_sha(unsigned len
, const unsigned char *a
, const unsigned char *b
)
71 static int find_short_packed_object(int len
, const unsigned char *match
, unsigned char *sha1
)
74 const unsigned char *found_sha1
= NULL
;
78 for (p
= packed_git
; p
&& found
< 2; p
= p
->next
) {
84 while (first
< last
) {
85 uint32_t mid
= (first
+ last
) / 2;
86 const unsigned char *now
;
89 now
= nth_packed_object_sha1(p
, mid
);
90 cmp
= hashcmp(match
, now
);
102 const unsigned char *now
, *next
;
103 now
= nth_packed_object_sha1(p
, first
);
104 if (match_sha(len
, match
, now
)) {
105 next
= nth_packed_object_sha1(p
, first
+1);
106 if (!next
|| !match_sha(len
, match
, next
)) {
107 /* unique within this pack */
112 else if (hashcmp(found_sha1
, now
)) {
118 /* not even unique within this pack */
126 hashcpy(sha1
, found_sha1
);
130 #define SHORT_NAME_NOT_FOUND (-1)
131 #define SHORT_NAME_AMBIGUOUS (-2)
133 static int find_unique_short_object(int len
, char *canonical
,
134 unsigned char *res
, unsigned char *sha1
)
136 int has_unpacked
, has_packed
;
137 unsigned char unpacked_sha1
[20], packed_sha1
[20];
140 has_unpacked
= find_short_object_filename(len
, canonical
, unpacked_sha1
);
141 has_packed
= find_short_packed_object(len
, res
, packed_sha1
);
142 if (!has_unpacked
&& !has_packed
)
143 return SHORT_NAME_NOT_FOUND
;
144 if (1 < has_unpacked
|| 1 < has_packed
)
145 return SHORT_NAME_AMBIGUOUS
;
146 if (has_unpacked
!= has_packed
) {
147 hashcpy(sha1
, (has_packed
? packed_sha1
: unpacked_sha1
));
150 /* Both have unique ones -- do they match? */
151 if (hashcmp(packed_sha1
, unpacked_sha1
))
152 return SHORT_NAME_AMBIGUOUS
;
153 hashcpy(sha1
, packed_sha1
);
157 static int get_short_sha1(const char *name
, int len
, unsigned char *sha1
,
162 unsigned char res
[20];
164 if (len
< MINIMUM_ABBREV
|| len
> 40)
167 memset(canonical
, 'x', 40);
168 for (i
= 0; i
< len
;i
++) {
169 unsigned char c
= name
[i
];
171 if (c
>= '0' && c
<= '9')
173 else if (c
>= 'a' && c
<= 'f')
175 else if (c
>= 'A' && c
<='F') {
187 status
= find_unique_short_object(i
, canonical
, res
, sha1
);
188 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
))
189 return error("short SHA1 %.*s is ambiguous.", len
, canonical
);
193 const char *find_unique_abbrev(const unsigned char *sha1
, int len
)
198 exists
= has_sha1_file(sha1
);
199 memcpy(hex
, sha1_to_hex(sha1
), 40);
200 if (len
== 40 || !len
)
203 unsigned char sha1_ret
[20];
204 status
= get_short_sha1(hex
, len
, sha1_ret
, 1);
207 : status
== SHORT_NAME_NOT_FOUND
) {
216 static int ambiguous_path(const char *path
, int len
)
221 for (cnt
= 0; cnt
< len
; cnt
++) {
242 * *string and *len will only be substituted, and *string returned (for
243 * later free()ing) if the string passed in is of the form @{-<n>}.
245 static char *substitute_nth_last_branch(const char **string
, int *len
)
247 struct strbuf buf
= STRBUF_INIT
;
248 int ret
= interpret_nth_last_branch(*string
, &buf
);
252 *string
= strbuf_detach(&buf
, &size
);
254 return (char *)*string
;
260 int dwim_ref(const char *str
, int len
, unsigned char *sha1
, char **ref
)
262 char *last_branch
= substitute_nth_last_branch(&str
, &len
);
267 for (p
= ref_rev_parse_rules
; *p
; p
++) {
268 char fullref
[PATH_MAX
];
269 unsigned char sha1_from_ref
[20];
270 unsigned char *this_result
;
272 this_result
= refs_found
? sha1_from_ref
: sha1
;
273 mksnpath(fullref
, sizeof(fullref
), *p
, len
, str
);
274 r
= resolve_ref(fullref
, this_result
, 1, NULL
);
278 if (!warn_ambiguous_refs
)
286 int dwim_log(const char *str
, int len
, unsigned char *sha1
, char **log
)
288 char *last_branch
= substitute_nth_last_branch(&str
, &len
);
293 for (p
= ref_rev_parse_rules
; *p
; p
++) {
295 unsigned char hash
[20];
297 const char *ref
, *it
;
299 mksnpath(path
, sizeof(path
), *p
, len
, str
);
300 ref
= resolve_ref(path
, hash
, 1, NULL
);
303 if (!stat(git_path("logs/%s", path
), &st
) &&
306 else if (strcmp(ref
, path
) &&
307 !stat(git_path("logs/%s", ref
), &st
) &&
316 if (!warn_ambiguous_refs
)
323 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
);
325 static int get_sha1_basic(const char *str
, int len
, unsigned char *sha1
)
327 static const char *warning
= "warning: refname '%.*s' is ambiguous.\n";
328 char *real_ref
= NULL
;
332 if (len
== 40 && !get_sha1_hex(str
, sha1
))
335 /* basic@{time or number or -number} format to query ref-log */
337 if (str
[len
-1] == '}') {
338 for (at
= len
-2; at
>= 0; at
--) {
339 if (str
[at
] == '@' && str
[at
+1] == '{') {
340 reflog_len
= (len
-1) - (at
+2);
347 /* Accept only unambiguous ref paths. */
348 if (len
&& ambiguous_path(str
, len
))
351 if (!len
&& reflog_len
) {
352 struct strbuf buf
= STRBUF_INIT
;
354 /* try the @{-N} syntax for n-th checkout */
355 ret
= interpret_nth_last_branch(str
+at
, &buf
);
357 /* substitute this branch name and restart */
358 return get_sha1_1(buf
.buf
, buf
.len
, sha1
);
359 } else if (ret
== 0) {
362 /* allow "@{...}" to mean the current branch reflog */
363 refs_found
= dwim_ref("HEAD", 4, sha1
, &real_ref
);
364 } else if (reflog_len
)
365 refs_found
= dwim_log(str
, len
, sha1
, &real_ref
);
367 refs_found
= dwim_ref(str
, len
, sha1
, &real_ref
);
372 if (warn_ambiguous_refs
&& refs_found
> 1)
373 fprintf(stderr
, warning
, len
, str
);
377 unsigned long at_time
;
378 unsigned long co_time
;
381 /* Is it asking for N-th entry, or approxidate? */
382 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
383 char ch
= str
[at
+2+i
];
384 if ('0' <= ch
&& ch
<= '9')
385 nth
= nth
* 10 + ch
- '0';
389 if (100000000 <= nth
) {
395 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
396 at_time
= approxidate(tmp
);
399 if (read_ref_at(real_ref
, at_time
, nth
, sha1
, NULL
,
400 &co_time
, &co_tz
, &co_cnt
)) {
403 "warning: Log for '%.*s' only goes "
404 "back to %s.\n", len
, str
,
405 show_date(co_time
, co_tz
, DATE_RFC2822
));
408 "warning: Log for '%.*s' only has "
409 "%d entries.\n", len
, str
, co_cnt
);
417 static int get_parent(const char *name
, int len
,
418 unsigned char *result
, int idx
)
420 unsigned char sha1
[20];
421 int ret
= get_sha1_1(name
, len
, sha1
);
422 struct commit
*commit
;
423 struct commit_list
*p
;
427 commit
= lookup_commit_reference(sha1
);
430 if (parse_commit(commit
))
433 hashcpy(result
, commit
->object
.sha1
);
439 hashcpy(result
, p
->item
->object
.sha1
);
447 static int get_nth_ancestor(const char *name
, int len
,
448 unsigned char *result
, int generation
)
450 unsigned char sha1
[20];
451 struct commit
*commit
;
454 ret
= get_sha1_1(name
, len
, sha1
);
457 commit
= lookup_commit_reference(sha1
);
461 while (generation
--) {
462 if (parse_commit(commit
) || !commit
->parents
)
464 commit
= commit
->parents
->item
;
466 hashcpy(result
, commit
->object
.sha1
);
470 struct object
*peel_to_type(const char *name
, int namelen
,
471 struct object
*o
, enum object_type expected_type
)
473 if (name
&& !namelen
)
474 namelen
= strlen(name
);
476 unsigned char sha1
[20];
477 if (get_sha1_1(name
, namelen
, sha1
))
479 o
= parse_object(sha1
);
482 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
484 if (o
->type
== expected_type
)
486 if (o
->type
== OBJ_TAG
)
487 o
= ((struct tag
*) o
)->tagged
;
488 else if (o
->type
== OBJ_COMMIT
)
489 o
= &(((struct commit
*) o
)->tree
->object
);
492 error("%.*s: expected %s type, but the object "
493 "dereferences to %s type",
494 namelen
, name
, typename(expected_type
),
501 static int peel_onion(const char *name
, int len
, unsigned char *sha1
)
503 unsigned char outer
[20];
505 unsigned int expected_type
= 0;
509 * "ref^{type}" dereferences ref repeatedly until you cannot
510 * dereference anymore, or you get an object of given type,
511 * whichever comes first. "ref^{}" means just dereference
512 * tags until you get a non-tag. "ref^0" is a shorthand for
513 * "ref^{commit}". "commit^{tree}" could be used to find the
514 * top-level tree of the given commit.
516 if (len
< 4 || name
[len
-1] != '}')
519 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
521 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
527 sp
++; /* beginning of type name, or closing brace for empty */
528 if (!strncmp(commit_type
, sp
, 6) && sp
[6] == '}')
529 expected_type
= OBJ_COMMIT
;
530 else if (!strncmp(tree_type
, sp
, 4) && sp
[4] == '}')
531 expected_type
= OBJ_TREE
;
532 else if (!strncmp(blob_type
, sp
, 4) && sp
[4] == '}')
533 expected_type
= OBJ_BLOB
;
534 else if (sp
[0] == '}')
535 expected_type
= OBJ_NONE
;
539 if (get_sha1_1(name
, sp
- name
- 2, outer
))
542 o
= parse_object(outer
);
545 if (!expected_type
) {
546 o
= deref_tag(o
, name
, sp
- name
- 2);
547 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
549 hashcpy(sha1
, o
->sha1
);
553 * At this point, the syntax look correct, so
554 * if we do not get the needed object, we should
557 o
= peel_to_type(name
, len
, o
, expected_type
);
559 hashcpy(sha1
, o
->sha1
);
567 static int get_describe_name(const char *name
, int len
, unsigned char *sha1
)
571 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
573 if (hexval(ch
) & ~0377) {
574 /* We must be looking at g in "SOMETHING-g"
575 * for it to be describe output.
577 if (ch
== 'g' && cp
[-1] == '-') {
580 return get_short_sha1(cp
, len
, sha1
, 1);
587 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
)
593 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
596 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
598 if ('0' <= ch
&& ch
<= '9')
600 if (ch
== '~' || ch
== '^')
607 int len1
= cp
- name
;
609 while (cp
< name
+ len
)
610 num
= num
* 10 + *cp
++ - '0';
611 if (!num
&& len1
== len
- 1)
613 if (has_suffix
== '^')
614 return get_parent(name
, len1
, sha1
, num
);
615 /* else if (has_suffix == '~') -- goes without saying */
616 return get_nth_ancestor(name
, len1
, sha1
, num
);
619 ret
= peel_onion(name
, len
, sha1
);
623 ret
= get_sha1_basic(name
, len
, sha1
);
627 /* It could be describe output that is "SOMETHING-gXXXX" */
628 ret
= get_describe_name(name
, len
, sha1
);
632 return get_short_sha1(name
, len
, sha1
, 0);
635 static int handle_one_ref(const char *path
,
636 const unsigned char *sha1
, int flag
, void *cb_data
)
638 struct commit_list
**list
= cb_data
;
639 struct object
*object
= parse_object(sha1
);
642 if (object
->type
== OBJ_TAG
) {
643 object
= deref_tag(object
, path
, strlen(path
));
647 if (object
->type
!= OBJ_COMMIT
)
649 insert_by_date((struct commit
*)object
, list
);
654 * This interprets names like ':/Initial revision of "git"' by searching
655 * through history and returning the first commit whose message starts
656 * with the given string.
658 * For future extension, ':/!' is reserved. If you want to match a message
659 * beginning with a '!', you have to repeat the exclamation mark.
662 #define ONELINE_SEEN (1u<<20)
663 static int get_sha1_oneline(const char *prefix
, unsigned char *sha1
)
665 struct commit_list
*list
= NULL
, *backup
= NULL
, *l
;
667 char *temp_commit_buffer
= NULL
;
669 if (prefix
[0] == '!') {
670 if (prefix
[1] != '!')
671 die ("Invalid search pattern: %s", prefix
);
674 for_each_ref(handle_one_ref
, &list
);
675 for (l
= list
; l
; l
= l
->next
)
676 commit_list_insert(l
->item
, &backup
);
679 struct commit
*commit
;
680 enum object_type type
;
683 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
684 if (!parse_object(commit
->object
.sha1
))
686 free(temp_commit_buffer
);
690 p
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
693 temp_commit_buffer
= p
;
695 if (!(p
= strstr(p
, "\n\n")))
697 if (!prefixcmp(p
+ 2, prefix
)) {
698 hashcpy(sha1
, commit
->object
.sha1
);
703 free(temp_commit_buffer
);
704 free_commit_list(list
);
705 for (l
= backup
; l
; l
= l
->next
)
706 clear_commit_marks(l
->item
, ONELINE_SEEN
);
710 struct grab_nth_branch_switch_cbdata
{
715 static int grab_nth_branch_switch(unsigned char *osha1
, unsigned char *nsha1
,
716 const char *email
, unsigned long timestamp
, int tz
,
717 const char *message
, void *cb_data
)
719 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
720 const char *match
= NULL
, *target
= NULL
;
724 if (!prefixcmp(message
, "checkout: moving from ")) {
725 match
= message
+ strlen("checkout: moving from ");
726 if ((target
= strstr(match
, " to ")) != NULL
)
733 len
= target
- match
- 4;
734 if (target
[len
] == '\n' && !strncmp(match
, target
, len
))
737 nth
= cb
->cnt
++ % cb
->alloc
;
738 strbuf_reset(&cb
->buf
[nth
]);
739 strbuf_add(&cb
->buf
[nth
], match
, len
);
744 * This reads "@{-N}" syntax, finds the name of the Nth previous
745 * branch we were on, and places the name of the branch in the given
746 * buf and returns the number of characters parsed if successful.
748 * If the input is not of the accepted format, it returns a negative
749 * number to signal an error.
751 * If the input was ok but there are not N branch switches in the
752 * reflog, it returns 0.
754 int interpret_nth_last_branch(const char *name
, struct strbuf
*buf
)
758 struct grab_nth_branch_switch_cbdata cb
;
762 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
764 brace
= strchr(name
, '}');
767 nth
= strtol(name
+3, &num_end
, 10);
768 if (num_end
!= brace
)
773 cb
.buf
= xmalloc(nth
* sizeof(struct strbuf
));
774 for (i
= 0; i
< nth
; i
++)
775 strbuf_init(&cb
.buf
[i
], 20);
777 for_each_reflog_ent("HEAD", grab_nth_branch_switch
, &cb
);
782 strbuf_add(buf
, cb
.buf
[i
].buf
, cb
.buf
[i
].len
);
783 for (i
= 0; i
< nth
; i
++)
784 strbuf_release(&cb
.buf
[i
]);
791 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
792 * notably "xyz^" for "parent of xyz"
794 int get_sha1(const char *name
, unsigned char *sha1
)
797 return get_sha1_with_mode(name
, sha1
, &unused
);
800 int get_sha1_with_mode(const char *name
, unsigned char *sha1
, unsigned *mode
)
802 int ret
, bracket_depth
;
803 int namelen
= strlen(name
);
807 ret
= get_sha1_1(name
, namelen
, sha1
);
810 /* sha1:path --> object name of path in ent sha1
811 * :path -> object name of path in index
812 * :[0-3]:path -> object name of path in index at stage
814 if (name
[0] == ':') {
816 struct cache_entry
*ce
;
818 if (namelen
> 2 && name
[1] == '/')
819 return get_sha1_oneline(name
+ 2, sha1
);
822 name
[1] < '0' || '3' < name
[1])
825 stage
= name
[1] - '0';
828 namelen
= namelen
- (cp
- name
);
831 pos
= cache_name_pos(cp
, namelen
);
834 while (pos
< active_nr
) {
835 ce
= active_cache
[pos
];
836 if (ce_namelen(ce
) != namelen
||
837 memcmp(ce
->name
, cp
, namelen
))
839 if (ce_stage(ce
) == stage
) {
840 hashcpy(sha1
, ce
->sha1
);
848 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
851 else if (bracket_depth
&& *cp
== '}')
853 else if (!bracket_depth
&& *cp
== ':')
857 unsigned char tree_sha1
[20];
858 if (!get_sha1_1(name
, cp
-name
, tree_sha1
))
859 return get_tree_entry(tree_sha1
, cp
+1, sha1
,