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_branch_name(const char **string
, int *len
)
247 struct strbuf buf
= STRBUF_INIT
;
248 int ret
= interpret_branch_name(*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_branch_name(&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
;
273 this_result
= refs_found
? sha1_from_ref
: sha1
;
274 mksnpath(fullref
, sizeof(fullref
), *p
, len
, str
);
275 r
= resolve_ref(fullref
, this_result
, 1, &flag
);
279 if (!warn_ambiguous_refs
)
281 } else if ((flag
& REF_ISSYMREF
) &&
282 (len
!= 4 || strcmp(str
, "HEAD")))
283 warning("ignoring dangling symref %s.", fullref
);
289 int dwim_log(const char *str
, int len
, unsigned char *sha1
, char **log
)
291 char *last_branch
= substitute_branch_name(&str
, &len
);
296 for (p
= ref_rev_parse_rules
; *p
; p
++) {
298 unsigned char hash
[20];
300 const char *ref
, *it
;
302 mksnpath(path
, sizeof(path
), *p
, len
, str
);
303 ref
= resolve_ref(path
, hash
, 1, NULL
);
306 if (!stat(git_path("logs/%s", path
), &st
) &&
309 else if (strcmp(ref
, path
) &&
310 !stat(git_path("logs/%s", ref
), &st
) &&
319 if (!warn_ambiguous_refs
)
326 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
);
328 static int get_sha1_basic(const char *str
, int len
, unsigned char *sha1
)
330 static const char *warning
= "warning: refname '%.*s' is ambiguous.\n";
331 char *real_ref
= NULL
;
335 if (len
== 40 && !get_sha1_hex(str
, sha1
))
338 /* basic@{time or number or -number} format to query ref-log */
340 if (len
&& str
[len
-1] == '}') {
341 for (at
= len
-2; at
>= 0; at
--) {
342 if (str
[at
] == '@' && str
[at
+1] == '{') {
343 reflog_len
= (len
-1) - (at
+2);
350 /* Accept only unambiguous ref paths. */
351 if (len
&& ambiguous_path(str
, len
))
354 if (!len
&& reflog_len
) {
355 struct strbuf buf
= STRBUF_INIT
;
357 /* try the @{-N} syntax for n-th checkout */
358 ret
= interpret_branch_name(str
+at
, &buf
);
360 /* substitute this branch name and restart */
361 return get_sha1_1(buf
.buf
, buf
.len
, sha1
);
362 } else if (ret
== 0) {
365 /* allow "@{...}" to mean the current branch reflog */
366 refs_found
= dwim_ref("HEAD", 4, sha1
, &real_ref
);
367 } else if (reflog_len
)
368 refs_found
= dwim_log(str
, len
, sha1
, &real_ref
);
370 refs_found
= dwim_ref(str
, len
, sha1
, &real_ref
);
375 if (warn_ambiguous_refs
&& refs_found
> 1)
376 fprintf(stderr
, warning
, len
, str
);
380 unsigned long at_time
;
381 unsigned long co_time
;
384 /* Is it asking for N-th entry, or approxidate? */
385 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
386 char ch
= str
[at
+2+i
];
387 if ('0' <= ch
&& ch
<= '9')
388 nth
= nth
* 10 + ch
- '0';
392 if (100000000 <= nth
) {
398 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
399 at_time
= approxidate(tmp
);
402 if (read_ref_at(real_ref
, at_time
, nth
, sha1
, NULL
,
403 &co_time
, &co_tz
, &co_cnt
)) {
406 "warning: Log for '%.*s' only goes "
407 "back to %s.\n", len
, str
,
408 show_date(co_time
, co_tz
, DATE_RFC2822
));
411 "warning: Log for '%.*s' only has "
412 "%d entries.\n", len
, str
, co_cnt
);
420 static int get_parent(const char *name
, int len
,
421 unsigned char *result
, int idx
)
423 unsigned char sha1
[20];
424 int ret
= get_sha1_1(name
, len
, sha1
);
425 struct commit
*commit
;
426 struct commit_list
*p
;
430 commit
= lookup_commit_reference(sha1
);
433 if (parse_commit(commit
))
436 hashcpy(result
, commit
->object
.sha1
);
442 hashcpy(result
, p
->item
->object
.sha1
);
450 static int get_nth_ancestor(const char *name
, int len
,
451 unsigned char *result
, int generation
)
453 unsigned char sha1
[20];
454 struct commit
*commit
;
457 ret
= get_sha1_1(name
, len
, sha1
);
460 commit
= lookup_commit_reference(sha1
);
464 while (generation
--) {
465 if (parse_commit(commit
) || !commit
->parents
)
467 commit
= commit
->parents
->item
;
469 hashcpy(result
, commit
->object
.sha1
);
473 struct object
*peel_to_type(const char *name
, int namelen
,
474 struct object
*o
, enum object_type expected_type
)
476 if (name
&& !namelen
)
477 namelen
= strlen(name
);
479 unsigned char sha1
[20];
480 if (get_sha1_1(name
, namelen
, sha1
))
482 o
= parse_object(sha1
);
485 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
487 if (o
->type
== expected_type
)
489 if (o
->type
== OBJ_TAG
)
490 o
= ((struct tag
*) o
)->tagged
;
491 else if (o
->type
== OBJ_COMMIT
)
492 o
= &(((struct commit
*) o
)->tree
->object
);
495 error("%.*s: expected %s type, but the object "
496 "dereferences to %s type",
497 namelen
, name
, typename(expected_type
),
504 static int peel_onion(const char *name
, int len
, unsigned char *sha1
)
506 unsigned char outer
[20];
508 unsigned int expected_type
= 0;
512 * "ref^{type}" dereferences ref repeatedly until you cannot
513 * dereference anymore, or you get an object of given type,
514 * whichever comes first. "ref^{}" means just dereference
515 * tags until you get a non-tag. "ref^0" is a shorthand for
516 * "ref^{commit}". "commit^{tree}" could be used to find the
517 * top-level tree of the given commit.
519 if (len
< 4 || name
[len
-1] != '}')
522 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
524 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
530 sp
++; /* beginning of type name, or closing brace for empty */
531 if (!strncmp(commit_type
, sp
, 6) && sp
[6] == '}')
532 expected_type
= OBJ_COMMIT
;
533 else if (!strncmp(tree_type
, sp
, 4) && sp
[4] == '}')
534 expected_type
= OBJ_TREE
;
535 else if (!strncmp(blob_type
, sp
, 4) && sp
[4] == '}')
536 expected_type
= OBJ_BLOB
;
537 else if (sp
[0] == '}')
538 expected_type
= OBJ_NONE
;
542 if (get_sha1_1(name
, sp
- name
- 2, outer
))
545 o
= parse_object(outer
);
548 if (!expected_type
) {
549 o
= deref_tag(o
, name
, sp
- name
- 2);
550 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
552 hashcpy(sha1
, o
->sha1
);
556 * At this point, the syntax look correct, so
557 * if we do not get the needed object, we should
560 o
= peel_to_type(name
, len
, o
, expected_type
);
562 hashcpy(sha1
, o
->sha1
);
570 static int get_describe_name(const char *name
, int len
, unsigned char *sha1
)
574 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
576 if (hexval(ch
) & ~0377) {
577 /* We must be looking at g in "SOMETHING-g"
578 * for it to be describe output.
580 if (ch
== 'g' && cp
[-1] == '-') {
583 return get_short_sha1(cp
, len
, sha1
, 1);
590 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
)
596 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
599 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
601 if ('0' <= ch
&& ch
<= '9')
603 if (ch
== '~' || ch
== '^')
610 int len1
= cp
- name
;
612 while (cp
< name
+ len
)
613 num
= num
* 10 + *cp
++ - '0';
614 if (!num
&& len1
== len
- 1)
616 if (has_suffix
== '^')
617 return get_parent(name
, len1
, sha1
, num
);
618 /* else if (has_suffix == '~') -- goes without saying */
619 return get_nth_ancestor(name
, len1
, sha1
, num
);
622 ret
= peel_onion(name
, len
, sha1
);
626 ret
= get_sha1_basic(name
, len
, sha1
);
630 /* It could be describe output that is "SOMETHING-gXXXX" */
631 ret
= get_describe_name(name
, len
, sha1
);
635 return get_short_sha1(name
, len
, sha1
, 0);
638 static int handle_one_ref(const char *path
,
639 const unsigned char *sha1
, int flag
, void *cb_data
)
641 struct commit_list
**list
= cb_data
;
642 struct object
*object
= parse_object(sha1
);
645 if (object
->type
== OBJ_TAG
) {
646 object
= deref_tag(object
, path
, strlen(path
));
650 if (object
->type
!= OBJ_COMMIT
)
652 insert_by_date((struct commit
*)object
, list
);
657 * This interprets names like ':/Initial revision of "git"' by searching
658 * through history and returning the first commit whose message starts
659 * with the given string.
661 * For future extension, ':/!' is reserved. If you want to match a message
662 * beginning with a '!', you have to repeat the exclamation mark.
665 #define ONELINE_SEEN (1u<<20)
666 static int get_sha1_oneline(const char *prefix
, unsigned char *sha1
)
668 struct commit_list
*list
= NULL
, *backup
= NULL
, *l
;
670 char *temp_commit_buffer
= NULL
;
672 if (prefix
[0] == '!') {
673 if (prefix
[1] != '!')
674 die ("Invalid search pattern: %s", prefix
);
677 for_each_ref(handle_one_ref
, &list
);
678 for (l
= list
; l
; l
= l
->next
)
679 commit_list_insert(l
->item
, &backup
);
682 struct commit
*commit
;
683 enum object_type type
;
686 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
687 if (!parse_object(commit
->object
.sha1
))
689 free(temp_commit_buffer
);
693 p
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
696 temp_commit_buffer
= p
;
698 if (!(p
= strstr(p
, "\n\n")))
700 if (!prefixcmp(p
+ 2, prefix
)) {
701 hashcpy(sha1
, commit
->object
.sha1
);
706 free(temp_commit_buffer
);
707 free_commit_list(list
);
708 for (l
= backup
; l
; l
= l
->next
)
709 clear_commit_marks(l
->item
, ONELINE_SEEN
);
713 struct grab_nth_branch_switch_cbdata
{
718 static int grab_nth_branch_switch(unsigned char *osha1
, unsigned char *nsha1
,
719 const char *email
, unsigned long timestamp
, int tz
,
720 const char *message
, void *cb_data
)
722 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
723 const char *match
= NULL
, *target
= NULL
;
727 if (!prefixcmp(message
, "checkout: moving from ")) {
728 match
= message
+ strlen("checkout: moving from ");
729 target
= strstr(match
, " to ");
732 if (!match
|| !target
)
735 len
= target
- match
;
736 nth
= cb
->cnt
++ % cb
->alloc
;
737 strbuf_reset(&cb
->buf
[nth
]);
738 strbuf_add(&cb
->buf
[nth
], match
, len
);
743 * This reads "@{-N}" syntax, finds the name of the Nth previous
744 * branch we were on, and places the name of the branch in the given
745 * buf and returns the number of characters parsed if successful.
747 * If the input is not of the accepted format, it returns a negative
748 * number to signal an error.
750 * If the input was ok but there are not N branch switches in the
751 * reflog, it returns 0.
753 int interpret_branch_name(const char *name
, struct strbuf
*buf
)
757 struct grab_nth_branch_switch_cbdata cb
;
761 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
763 brace
= strchr(name
, '}');
766 nth
= strtol(name
+3, &num_end
, 10);
767 if (num_end
!= brace
)
772 cb
.buf
= xmalloc(nth
* sizeof(struct strbuf
));
773 for (i
= 0; i
< nth
; i
++)
774 strbuf_init(&cb
.buf
[i
], 20);
777 for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch
, 40960, &cb
);
780 for_each_reflog_ent("HEAD", grab_nth_branch_switch
, &cb
);
786 strbuf_add(buf
, cb
.buf
[i
].buf
, cb
.buf
[i
].len
);
787 retval
= brace
-name
+1;
790 for (i
= 0; i
< nth
; i
++)
791 strbuf_release(&cb
.buf
[i
]);
798 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
799 * notably "xyz^" for "parent of xyz"
801 int get_sha1(const char *name
, unsigned char *sha1
)
804 return get_sha1_with_mode(name
, sha1
, &unused
);
807 int get_sha1_with_mode(const char *name
, unsigned char *sha1
, unsigned *mode
)
809 int ret
, bracket_depth
;
810 int namelen
= strlen(name
);
814 ret
= get_sha1_1(name
, namelen
, sha1
);
817 /* sha1:path --> object name of path in ent sha1
818 * :path -> object name of path in index
819 * :[0-3]:path -> object name of path in index at stage
821 if (name
[0] == ':') {
823 struct cache_entry
*ce
;
825 if (namelen
> 2 && name
[1] == '/')
826 return get_sha1_oneline(name
+ 2, sha1
);
829 name
[1] < '0' || '3' < name
[1])
832 stage
= name
[1] - '0';
835 namelen
= namelen
- (cp
- name
);
838 pos
= cache_name_pos(cp
, namelen
);
841 while (pos
< active_nr
) {
842 ce
= active_cache
[pos
];
843 if (ce_namelen(ce
) != namelen
||
844 memcmp(ce
->name
, cp
, namelen
))
846 if (ce_stage(ce
) == stage
) {
847 hashcpy(sha1
, ce
->sha1
);
855 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
858 else if (bracket_depth
&& *cp
== '}')
860 else if (!bracket_depth
&& *cp
== ':')
864 unsigned char tree_sha1
[20];
865 if (!get_sha1_1(name
, cp
-name
, tree_sha1
))
866 return get_tree_entry(tree_sha1
, cp
+1, sha1
,