10 static int find_short_object_filename(int len
, const char *name
, unsigned char *sha1
)
12 struct alternate_object_database
*alt
;
15 static struct alternate_object_database
*fakeent
;
18 const char *objdir
= get_object_directory();
19 int objdir_len
= strlen(objdir
);
20 int entlen
= objdir_len
+ 43;
21 fakeent
= xmalloc(sizeof(*fakeent
) + entlen
);
22 memcpy(fakeent
->base
, objdir
, objdir_len
);
23 fakeent
->name
= fakeent
->base
+ objdir_len
+ 1;
24 fakeent
->name
[-1] = '/';
26 fakeent
->next
= alt_odb_list
;
28 sprintf(hex
, "%.2s", name
);
29 for (alt
= fakeent
; alt
&& found
< 2; alt
= alt
->next
) {
32 sprintf(alt
->name
, "%.2s/", name
);
33 dir
= opendir(alt
->base
);
36 while ((de
= readdir(dir
)) != NULL
) {
37 if (strlen(de
->d_name
) != 38)
39 if (memcmp(de
->d_name
, name
+ 2, len
- 2))
42 memcpy(hex
+ 2, de
->d_name
, 38);
45 else if (memcmp(hex
+ 2, de
->d_name
, 38)) {
53 return get_sha1_hex(hex
, sha1
) == 0;
57 static int match_sha(unsigned len
, const unsigned char *a
, const unsigned char *b
)
72 static int find_short_packed_object(int len
, const unsigned char *match
, unsigned char *sha1
)
75 const unsigned char *found_sha1
= NULL
;
79 for (p
= packed_git
; p
&& found
< 2; p
= p
->next
) {
85 while (first
< last
) {
86 uint32_t mid
= (first
+ last
) / 2;
87 const unsigned char *now
;
90 now
= nth_packed_object_sha1(p
, mid
);
91 cmp
= hashcmp(match
, now
);
103 const unsigned char *now
, *next
;
104 now
= nth_packed_object_sha1(p
, first
);
105 if (match_sha(len
, match
, now
)) {
106 next
= nth_packed_object_sha1(p
, first
+1);
107 if (!next
|| !match_sha(len
, match
, next
)) {
108 /* unique within this pack */
113 else if (hashcmp(found_sha1
, now
)) {
119 /* not even unique within this pack */
127 hashcpy(sha1
, found_sha1
);
131 #define SHORT_NAME_NOT_FOUND (-1)
132 #define SHORT_NAME_AMBIGUOUS (-2)
134 static int find_unique_short_object(int len
, char *canonical
,
135 unsigned char *res
, unsigned char *sha1
)
137 int has_unpacked
, has_packed
;
138 unsigned char unpacked_sha1
[20], packed_sha1
[20];
141 has_unpacked
= find_short_object_filename(len
, canonical
, unpacked_sha1
);
142 has_packed
= find_short_packed_object(len
, res
, packed_sha1
);
143 if (!has_unpacked
&& !has_packed
)
144 return SHORT_NAME_NOT_FOUND
;
145 if (1 < has_unpacked
|| 1 < has_packed
)
146 return SHORT_NAME_AMBIGUOUS
;
147 if (has_unpacked
!= has_packed
) {
148 hashcpy(sha1
, (has_packed
? packed_sha1
: unpacked_sha1
));
151 /* Both have unique ones -- do they match? */
152 if (hashcmp(packed_sha1
, unpacked_sha1
))
153 return SHORT_NAME_AMBIGUOUS
;
154 hashcpy(sha1
, packed_sha1
);
158 static int get_short_sha1(const char *name
, int len
, unsigned char *sha1
,
163 unsigned char res
[20];
165 if (len
< MINIMUM_ABBREV
|| len
> 40)
168 memset(canonical
, 'x', 40);
169 for (i
= 0; i
< len
;i
++) {
170 unsigned char c
= name
[i
];
172 if (c
>= '0' && c
<= '9')
174 else if (c
>= 'a' && c
<= 'f')
176 else if (c
>= 'A' && c
<='F') {
188 status
= find_unique_short_object(i
, canonical
, res
, sha1
);
189 if (!quietly
&& (status
== SHORT_NAME_AMBIGUOUS
))
190 return error("short SHA1 %.*s is ambiguous.", len
, canonical
);
194 const char *find_unique_abbrev(const unsigned char *sha1
, int len
)
199 exists
= has_sha1_file(sha1
);
200 memcpy(hex
, sha1_to_hex(sha1
), 40);
201 if (len
== 40 || !len
)
204 unsigned char sha1_ret
[20];
205 status
= get_short_sha1(hex
, len
, sha1_ret
, 1);
208 : status
== SHORT_NAME_NOT_FOUND
) {
217 static int ambiguous_path(const char *path
, int len
)
222 for (cnt
= 0; cnt
< len
; cnt
++) {
243 * *string and *len will only be substituted, and *string returned (for
244 * later free()ing) if the string passed in is a magic short-hand form
247 static char *substitute_branch_name(const char **string
, int *len
)
249 struct strbuf buf
= STRBUF_INIT
;
250 int ret
= interpret_branch_name(*string
, &buf
);
254 *string
= strbuf_detach(&buf
, &size
);
256 return (char *)*string
;
262 int dwim_ref(const char *str
, int len
, unsigned char *sha1
, char **ref
)
264 char *last_branch
= substitute_branch_name(&str
, &len
);
269 for (p
= ref_rev_parse_rules
; *p
; p
++) {
270 char fullref
[PATH_MAX
];
271 unsigned char sha1_from_ref
[20];
272 unsigned char *this_result
;
275 this_result
= refs_found
? sha1_from_ref
: sha1
;
276 mksnpath(fullref
, sizeof(fullref
), *p
, len
, str
);
277 r
= resolve_ref(fullref
, this_result
, 1, &flag
);
281 if (!warn_ambiguous_refs
)
283 } else if ((flag
& REF_ISSYMREF
) && strcmp(fullref
, "HEAD"))
284 warning("ignoring dangling symref %s.", fullref
);
290 int dwim_log(const char *str
, int len
, unsigned char *sha1
, char **log
)
292 char *last_branch
= substitute_branch_name(&str
, &len
);
297 for (p
= ref_rev_parse_rules
; *p
; p
++) {
299 unsigned char hash
[20];
301 const char *ref
, *it
;
303 mksnpath(path
, sizeof(path
), *p
, len
, str
);
304 ref
= resolve_ref(path
, hash
, 1, NULL
);
307 if (!stat(git_path("logs/%s", path
), &st
) &&
310 else if (strcmp(ref
, path
) &&
311 !stat(git_path("logs/%s", ref
), &st
) &&
320 if (!warn_ambiguous_refs
)
327 static inline int upstream_mark(const char *string
, int len
)
329 const char *suffix
[] = { "@{upstream}", "@{u}" };
332 for (i
= 0; i
< ARRAY_SIZE(suffix
); i
++) {
333 int suffix_len
= strlen(suffix
[i
]);
334 if (suffix_len
<= len
335 && !memcmp(string
, suffix
[i
], suffix_len
))
341 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
);
343 static int get_sha1_basic(const char *str
, int len
, unsigned char *sha1
)
345 static const char *warn_msg
= "refname '%.*s' is ambiguous.";
346 char *real_ref
= NULL
;
350 if (len
== 40 && !get_sha1_hex(str
, sha1
))
353 /* basic@{time or number or -number} format to query ref-log */
355 if (len
&& str
[len
-1] == '}') {
356 for (at
= len
-2; at
>= 0; at
--) {
357 if (str
[at
] == '@' && str
[at
+1] == '{') {
358 if (!upstream_mark(str
+ at
, len
- at
)) {
359 reflog_len
= (len
-1) - (at
+2);
367 /* Accept only unambiguous ref paths. */
368 if (len
&& ambiguous_path(str
, len
))
371 if (!len
&& reflog_len
) {
372 struct strbuf buf
= STRBUF_INIT
;
374 /* try the @{-N} syntax for n-th checkout */
375 ret
= interpret_branch_name(str
+at
, &buf
);
377 /* substitute this branch name and restart */
378 return get_sha1_1(buf
.buf
, buf
.len
, sha1
);
379 } else if (ret
== 0) {
382 /* allow "@{...}" to mean the current branch reflog */
383 refs_found
= dwim_ref("HEAD", 4, sha1
, &real_ref
);
384 } else if (reflog_len
)
385 refs_found
= dwim_log(str
, len
, sha1
, &real_ref
);
387 refs_found
= dwim_ref(str
, len
, sha1
, &real_ref
);
392 if (warn_ambiguous_refs
&& refs_found
> 1)
393 warning(warn_msg
, len
, str
);
397 unsigned long at_time
;
398 unsigned long co_time
;
401 /* a @{-N} placed anywhere except the start is an error */
402 if (str
[at
+2] == '-')
405 /* Is it asking for N-th entry, or approxidate? */
406 for (i
= nth
= 0; 0 <= nth
&& i
< reflog_len
; i
++) {
407 char ch
= str
[at
+2+i
];
408 if ('0' <= ch
&& ch
<= '9')
409 nth
= nth
* 10 + ch
- '0';
413 if (100000000 <= nth
) {
420 char *tmp
= xstrndup(str
+ at
+ 2, reflog_len
);
421 at_time
= approxidate_careful(tmp
, &errors
);
426 if (read_ref_at(real_ref
, at_time
, nth
, sha1
, NULL
,
427 &co_time
, &co_tz
, &co_cnt
)) {
429 warning("Log for '%.*s' only goes "
430 "back to %s.", len
, str
,
431 show_date(co_time
, co_tz
, DATE_RFC2822
));
434 die("Log for '%.*s' only has %d entries.",
444 static int get_parent(const char *name
, int len
,
445 unsigned char *result
, int idx
)
447 unsigned char sha1
[20];
448 int ret
= get_sha1_1(name
, len
, sha1
);
449 struct commit
*commit
;
450 struct commit_list
*p
;
454 commit
= lookup_commit_reference(sha1
);
457 if (parse_commit(commit
))
460 hashcpy(result
, commit
->object
.sha1
);
466 hashcpy(result
, p
->item
->object
.sha1
);
474 static int get_nth_ancestor(const char *name
, int len
,
475 unsigned char *result
, int generation
)
477 unsigned char sha1
[20];
478 struct commit
*commit
;
481 ret
= get_sha1_1(name
, len
, sha1
);
484 commit
= lookup_commit_reference(sha1
);
488 while (generation
--) {
489 if (parse_commit(commit
) || !commit
->parents
)
491 commit
= commit
->parents
->item
;
493 hashcpy(result
, commit
->object
.sha1
);
497 struct object
*peel_to_type(const char *name
, int namelen
,
498 struct object
*o
, enum object_type expected_type
)
500 if (name
&& !namelen
)
501 namelen
= strlen(name
);
503 unsigned char sha1
[20];
504 if (get_sha1_1(name
, namelen
, sha1
))
506 o
= parse_object(sha1
);
509 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
511 if (o
->type
== expected_type
)
513 if (o
->type
== OBJ_TAG
)
514 o
= ((struct tag
*) o
)->tagged
;
515 else if (o
->type
== OBJ_COMMIT
)
516 o
= &(((struct commit
*) o
)->tree
->object
);
519 error("%.*s: expected %s type, but the object "
520 "dereferences to %s type",
521 namelen
, name
, typename(expected_type
),
528 static int peel_onion(const char *name
, int len
, unsigned char *sha1
)
530 unsigned char outer
[20];
532 unsigned int expected_type
= 0;
536 * "ref^{type}" dereferences ref repeatedly until you cannot
537 * dereference anymore, or you get an object of given type,
538 * whichever comes first. "ref^{}" means just dereference
539 * tags until you get a non-tag. "ref^0" is a shorthand for
540 * "ref^{commit}". "commit^{tree}" could be used to find the
541 * top-level tree of the given commit.
543 if (len
< 4 || name
[len
-1] != '}')
546 for (sp
= name
+ len
- 1; name
<= sp
; sp
--) {
548 if (ch
== '{' && name
< sp
&& sp
[-1] == '^')
554 sp
++; /* beginning of type name, or closing brace for empty */
555 if (!strncmp(commit_type
, sp
, 6) && sp
[6] == '}')
556 expected_type
= OBJ_COMMIT
;
557 else if (!strncmp(tree_type
, sp
, 4) && sp
[4] == '}')
558 expected_type
= OBJ_TREE
;
559 else if (!strncmp(blob_type
, sp
, 4) && sp
[4] == '}')
560 expected_type
= OBJ_BLOB
;
561 else if (sp
[0] == '}')
562 expected_type
= OBJ_NONE
;
566 if (get_sha1_1(name
, sp
- name
- 2, outer
))
569 o
= parse_object(outer
);
572 if (!expected_type
) {
573 o
= deref_tag(o
, name
, sp
- name
- 2);
574 if (!o
|| (!o
->parsed
&& !parse_object(o
->sha1
)))
576 hashcpy(sha1
, o
->sha1
);
580 * At this point, the syntax look correct, so
581 * if we do not get the needed object, we should
584 o
= peel_to_type(name
, len
, o
, expected_type
);
586 hashcpy(sha1
, o
->sha1
);
594 static int get_describe_name(const char *name
, int len
, unsigned char *sha1
)
598 for (cp
= name
+ len
- 1; name
+ 2 <= cp
; cp
--) {
600 if (hexval(ch
) & ~0377) {
601 /* We must be looking at g in "SOMETHING-g"
602 * for it to be describe output.
604 if (ch
== 'g' && cp
[-1] == '-') {
607 return get_short_sha1(cp
, len
, sha1
, 1);
614 static int get_sha1_1(const char *name
, int len
, unsigned char *sha1
)
620 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
623 for (cp
= name
+ len
- 1; name
<= cp
; cp
--) {
625 if ('0' <= ch
&& ch
<= '9')
627 if (ch
== '~' || ch
== '^')
634 int len1
= cp
- name
;
636 while (cp
< name
+ len
)
637 num
= num
* 10 + *cp
++ - '0';
638 if (!num
&& len1
== len
- 1)
640 if (has_suffix
== '^')
641 return get_parent(name
, len1
, sha1
, num
);
642 /* else if (has_suffix == '~') -- goes without saying */
643 return get_nth_ancestor(name
, len1
, sha1
, num
);
646 ret
= peel_onion(name
, len
, sha1
);
650 ret
= get_sha1_basic(name
, len
, sha1
);
654 /* It could be describe output that is "SOMETHING-gXXXX" */
655 ret
= get_describe_name(name
, len
, sha1
);
659 return get_short_sha1(name
, len
, sha1
, 0);
663 * This interprets names like ':/Initial revision of "git"' by searching
664 * through history and returning the first commit whose message starts
665 * the given regular expression.
667 * For future extension, ':/!' is reserved. If you want to match a message
668 * beginning with a '!', you have to repeat the exclamation mark.
670 #define ONELINE_SEEN (1u<<20)
672 static int handle_one_ref(const char *path
,
673 const unsigned char *sha1
, int flag
, void *cb_data
)
675 struct commit_list
**list
= cb_data
;
676 struct object
*object
= parse_object(sha1
);
679 if (object
->type
== OBJ_TAG
) {
680 object
= deref_tag(object
, path
, strlen(path
));
684 if (object
->type
!= OBJ_COMMIT
)
686 insert_by_date((struct commit
*)object
, list
);
687 object
->flags
|= ONELINE_SEEN
;
691 static int get_sha1_oneline(const char *prefix
, unsigned char *sha1
)
693 struct commit_list
*list
= NULL
, *backup
= NULL
, *l
;
695 char *temp_commit_buffer
= NULL
;
698 if (prefix
[0] == '!') {
699 if (prefix
[1] != '!')
700 die ("Invalid search pattern: %s", prefix
);
704 if (regcomp(®ex
, prefix
, REG_EXTENDED
))
705 die("Invalid search pattern: %s", prefix
);
707 for_each_ref(handle_one_ref
, &list
);
708 for (l
= list
; l
; l
= l
->next
)
709 commit_list_insert(l
->item
, &backup
);
712 struct commit
*commit
;
713 enum object_type type
;
716 commit
= pop_most_recent_commit(&list
, ONELINE_SEEN
);
717 if (!parse_object(commit
->object
.sha1
))
719 free(temp_commit_buffer
);
723 p
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
726 temp_commit_buffer
= p
;
728 if (!(p
= strstr(p
, "\n\n")))
730 if (!regexec(®ex
, p
+ 2, 0, NULL
, 0)) {
731 hashcpy(sha1
, commit
->object
.sha1
);
737 free(temp_commit_buffer
);
738 free_commit_list(list
);
739 for (l
= backup
; l
; l
= l
->next
)
740 clear_commit_marks(l
->item
, ONELINE_SEEN
);
744 struct grab_nth_branch_switch_cbdata
{
749 static int grab_nth_branch_switch(unsigned char *osha1
, unsigned char *nsha1
,
750 const char *email
, unsigned long timestamp
, int tz
,
751 const char *message
, void *cb_data
)
753 struct grab_nth_branch_switch_cbdata
*cb
= cb_data
;
754 const char *match
= NULL
, *target
= NULL
;
758 if (!prefixcmp(message
, "checkout: moving from ")) {
759 match
= message
+ strlen("checkout: moving from ");
760 target
= strstr(match
, " to ");
763 if (!match
|| !target
)
766 len
= target
- match
;
767 nth
= cb
->cnt
++ % cb
->alloc
;
768 strbuf_reset(&cb
->buf
[nth
]);
769 strbuf_add(&cb
->buf
[nth
], match
, len
);
774 * Parse @{-N} syntax, return the number of characters parsed
775 * if successful; otherwise signal an error with negative value.
777 static int interpret_nth_prior_checkout(const char *name
, struct strbuf
*buf
)
781 struct grab_nth_branch_switch_cbdata cb
;
785 if (name
[0] != '@' || name
[1] != '{' || name
[2] != '-')
787 brace
= strchr(name
, '}');
790 nth
= strtol(name
+3, &num_end
, 10);
791 if (num_end
!= brace
)
796 cb
.buf
= xmalloc(nth
* sizeof(struct strbuf
));
797 for (i
= 0; i
< nth
; i
++)
798 strbuf_init(&cb
.buf
[i
], 20);
801 for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch
, 40960, &cb
);
804 for_each_reflog_ent("HEAD", grab_nth_branch_switch
, &cb
);
810 strbuf_add(buf
, cb
.buf
[i
].buf
, cb
.buf
[i
].len
);
811 retval
= brace
-name
+1;
814 for (i
= 0; i
< nth
; i
++)
815 strbuf_release(&cb
.buf
[i
]);
821 int get_sha1_mb(const char *name
, unsigned char *sha1
)
823 struct commit
*one
, *two
;
824 struct commit_list
*mbs
;
825 unsigned char sha1_tmp
[20];
829 dots
= strstr(name
, "...");
831 return get_sha1(name
, sha1
);
833 st
= get_sha1("HEAD", sha1_tmp
);
836 strbuf_init(&sb
, dots
- name
);
837 strbuf_add(&sb
, name
, dots
- name
);
838 st
= get_sha1(sb
.buf
, sha1_tmp
);
843 one
= lookup_commit_reference_gently(sha1_tmp
, 0);
847 if (get_sha1(dots
[3] ? (dots
+ 3) : "HEAD", sha1_tmp
))
849 two
= lookup_commit_reference_gently(sha1_tmp
, 0);
852 mbs
= get_merge_bases(one
, two
, 1);
853 if (!mbs
|| mbs
->next
)
857 hashcpy(sha1
, mbs
->item
->object
.sha1
);
859 free_commit_list(mbs
);
864 * This reads short-hand syntax that not only evaluates to a commit
865 * object name, but also can act as if the end user spelled the name
866 * of the branch from the command line.
868 * - "@{-N}" finds the name of the Nth previous branch we were on, and
869 * places the name of the branch in the given buf and returns the
870 * number of characters parsed if successful.
872 * - "<branch>@{upstream}" finds the name of the other ref that
873 * <branch> is configured to merge with (missing <branch> defaults
874 * to the current branch), and places the name of the branch in the
875 * given buf and returns the number of characters parsed if
878 * If the input is not of the accepted format, it returns a negative
879 * number to signal an error.
881 * If the input was ok but there are not N branch switches in the
882 * reflog, it returns 0.
884 int interpret_branch_name(const char *name
, struct strbuf
*buf
)
887 struct branch
*upstream
;
888 int namelen
= strlen(name
);
889 int len
= interpret_nth_prior_checkout(name
, buf
);
893 return len
; /* syntax Ok, not enough switches */
894 if (0 < len
&& len
== namelen
)
895 return len
; /* consumed all */
897 /* we have extra data, which might need further processing */
898 struct strbuf tmp
= STRBUF_INIT
;
902 strbuf_add(buf
, name
+ len
, namelen
- len
);
903 ret
= interpret_branch_name(buf
->buf
, &tmp
);
904 /* that data was not interpreted, remove our cruft */
906 strbuf_setlen(buf
, used
);
910 strbuf_addbuf(buf
, &tmp
);
911 strbuf_release(&tmp
);
912 /* tweak for size of {-N} versus expanded ref name */
913 return ret
- used
+ len
;
916 cp
= strchr(name
, '@');
919 tmp_len
= upstream_mark(cp
, namelen
- (cp
- name
));
922 len
= cp
+ tmp_len
- name
;
923 cp
= xstrndup(name
, cp
- name
);
924 upstream
= branch_get(*cp
? cp
: NULL
);
927 || !upstream
->merge
[0]->dst
)
928 return error("No upstream branch found for '%s'", cp
);
930 cp
= shorten_unambiguous_ref(upstream
->merge
[0]->dst
, 0);
932 strbuf_addstr(buf
, cp
);
937 int strbuf_branchname(struct strbuf
*sb
, const char *name
)
939 int len
= strlen(name
);
940 if (interpret_branch_name(name
, sb
) == len
)
942 strbuf_add(sb
, name
, len
);
946 int strbuf_check_branch_ref(struct strbuf
*sb
, const char *name
)
948 strbuf_branchname(sb
, name
);
950 return CHECK_REF_FORMAT_ERROR
;
951 strbuf_splice(sb
, 0, 0, "refs/heads/", 11);
952 return check_ref_format(sb
->buf
);
956 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
957 * notably "xyz^" for "parent of xyz"
959 int get_sha1(const char *name
, unsigned char *sha1
)
961 struct object_context unused
;
962 return get_sha1_with_context(name
, sha1
, &unused
);
965 /* Must be called only when object_name:filename doesn't exist. */
966 static void diagnose_invalid_sha1_path(const char *prefix
,
967 const char *filename
,
968 const unsigned char *tree_sha1
,
969 const char *object_name
)
972 unsigned char sha1
[20];
978 if (!lstat(filename
, &st
))
979 die("Path '%s' exists on disk, but not in '%s'.",
980 filename
, object_name
);
981 if (errno
== ENOENT
|| errno
== ENOTDIR
) {
982 char *fullname
= xmalloc(strlen(filename
)
983 + strlen(prefix
) + 1);
984 strcpy(fullname
, prefix
);
985 strcat(fullname
, filename
);
987 if (!get_tree_entry(tree_sha1
, fullname
,
989 die("Path '%s' exists, but not '%s'.\n"
990 "Did you mean '%s:%s'?",
996 die("Path '%s' does not exist in '%s'",
997 filename
, object_name
);
1001 /* Must be called only when :stage:filename doesn't exist. */
1002 static void diagnose_invalid_index_path(int stage
,
1004 const char *filename
)
1007 struct cache_entry
*ce
;
1009 unsigned namelen
= strlen(filename
);
1010 unsigned fullnamelen
;
1016 /* Wrong stage number? */
1017 pos
= cache_name_pos(filename
, namelen
);
1020 if (pos
< active_nr
) {
1021 ce
= active_cache
[pos
];
1022 if (ce_namelen(ce
) == namelen
&&
1023 !memcmp(ce
->name
, filename
, namelen
))
1024 die("Path '%s' is in the index, but not at stage %d.\n"
1025 "Did you mean ':%d:%s'?",
1027 ce_stage(ce
), filename
);
1030 /* Confusion between relative and absolute filenames? */
1031 fullnamelen
= namelen
+ strlen(prefix
);
1032 fullname
= xmalloc(fullnamelen
+ 1);
1033 strcpy(fullname
, prefix
);
1034 strcat(fullname
, filename
);
1035 pos
= cache_name_pos(fullname
, fullnamelen
);
1038 if (pos
< active_nr
) {
1039 ce
= active_cache
[pos
];
1040 if (ce_namelen(ce
) == fullnamelen
&&
1041 !memcmp(ce
->name
, fullname
, fullnamelen
))
1042 die("Path '%s' is in the index, but not '%s'.\n"
1043 "Did you mean ':%d:%s'?",
1045 ce_stage(ce
), fullname
);
1048 if (!lstat(filename
, &st
))
1049 die("Path '%s' exists on disk, but not in the index.", filename
);
1050 if (errno
== ENOENT
|| errno
== ENOTDIR
)
1051 die("Path '%s' does not exist (neither on disk nor in the index).",
1058 int get_sha1_with_mode_1(const char *name
, unsigned char *sha1
, unsigned *mode
, int gently
, const char *prefix
)
1060 struct object_context oc
;
1062 ret
= get_sha1_with_context_1(name
, sha1
, &oc
, gently
, prefix
);
1067 int get_sha1_with_context_1(const char *name
, unsigned char *sha1
,
1068 struct object_context
*oc
,
1069 int gently
, const char *prefix
)
1071 int ret
, bracket_depth
;
1072 int namelen
= strlen(name
);
1075 memset(oc
, 0, sizeof(*oc
));
1076 oc
->mode
= S_IFINVALID
;
1077 ret
= get_sha1_1(name
, namelen
, sha1
);
1080 /* sha1:path --> object name of path in ent sha1
1081 * :path -> object name of path in index
1082 * :[0-3]:path -> object name of path in index at stage
1083 * :/foo -> recent commit matching foo
1085 if (name
[0] == ':') {
1087 struct cache_entry
*ce
;
1089 if (namelen
> 2 && name
[1] == '/')
1090 /* don't need mode for commit */
1091 return get_sha1_oneline(name
+ 2, sha1
);
1094 name
[1] < '0' || '3' < name
[1])
1097 stage
= name
[1] - '0';
1100 namelen
= namelen
- (cp
- name
);
1102 strncpy(oc
->path
, cp
,
1104 oc
->path
[sizeof(oc
->path
)-1] = '\0';
1108 pos
= cache_name_pos(cp
, namelen
);
1111 while (pos
< active_nr
) {
1112 ce
= active_cache
[pos
];
1113 if (ce_namelen(ce
) != namelen
||
1114 memcmp(ce
->name
, cp
, namelen
))
1116 if (ce_stage(ce
) == stage
) {
1117 hashcpy(sha1
, ce
->sha1
);
1118 oc
->mode
= ce
->ce_mode
;
1124 diagnose_invalid_index_path(stage
, prefix
, cp
);
1127 for (cp
= name
, bracket_depth
= 0; *cp
; cp
++) {
1130 else if (bracket_depth
&& *cp
== '}')
1132 else if (!bracket_depth
&& *cp
== ':')
1136 unsigned char tree_sha1
[20];
1137 char *object_name
= NULL
;
1139 object_name
= xmalloc(cp
-name
+1);
1140 strncpy(object_name
, name
, cp
-name
);
1141 object_name
[cp
-name
] = '\0';
1143 if (!get_sha1_1(name
, cp
-name
, tree_sha1
)) {
1144 const char *filename
= cp
+1;
1145 ret
= get_tree_entry(tree_sha1
, filename
, sha1
, &oc
->mode
);
1147 diagnose_invalid_sha1_path(prefix
, filename
,
1148 tree_sha1
, object_name
);
1151 hashcpy(oc
->tree
, tree_sha1
);
1152 strncpy(oc
->path
, filename
,
1154 oc
->path
[sizeof(oc
->path
)-1] = '\0';
1159 die("Invalid object name '%s'.", object_name
);