]>
Commit | Line | Data |
---|---|---|
9938af6a | 1 | #include "cache.h" |
5385f52d | 2 | #include "tag.h" |
9938af6a | 3 | #include "commit.h" |
5385f52d JH |
4 | #include "tree.h" |
5 | #include "blob.h" | |
f3ab49db | 6 | #include "tree-walk.h" |
d556fae2 | 7 | #include "refs.h" |
9938af6a JH |
8 | |
9 | static int find_short_object_filename(int len, const char *name, unsigned char *sha1) | |
10 | { | |
99a19b43 | 11 | struct alternate_object_database *alt; |
9938af6a | 12 | char hex[40]; |
99a19b43 JH |
13 | int found = 0; |
14 | static struct alternate_object_database *fakeent; | |
15 | ||
16 | if (!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] = '/'; | |
24 | } | |
25 | fakeent->next = alt_odb_list; | |
9938af6a | 26 | |
9938af6a | 27 | sprintf(hex, "%.2s", name); |
99a19b43 | 28 | for (alt = fakeent; alt && found < 2; alt = alt->next) { |
9938af6a | 29 | struct dirent *de; |
99a19b43 JH |
30 | DIR *dir; |
31 | sprintf(alt->name, "%.2s/", name); | |
32 | dir = opendir(alt->base); | |
33 | if (!dir) | |
34 | continue; | |
9938af6a JH |
35 | while ((de = readdir(dir)) != NULL) { |
36 | if (strlen(de->d_name) != 38) | |
37 | continue; | |
99a19b43 | 38 | if (memcmp(de->d_name, name + 2, len - 2)) |
9938af6a | 39 | continue; |
99a19b43 JH |
40 | if (!found) { |
41 | memcpy(hex + 2, de->d_name, 38); | |
42 | found++; | |
43 | } | |
44 | else if (memcmp(hex + 2, de->d_name, 38)) { | |
45 | found = 2; | |
9938af6a | 46 | break; |
99a19b43 | 47 | } |
9938af6a JH |
48 | } |
49 | closedir(dir); | |
50 | } | |
51 | if (found == 1) | |
52 | return get_sha1_hex(hex, sha1) == 0; | |
99a19b43 | 53 | return found; |
9938af6a JH |
54 | } |
55 | ||
56 | static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b) | |
57 | { | |
58 | do { | |
59 | if (*a != *b) | |
60 | return 0; | |
61 | a++; | |
62 | b++; | |
63 | len -= 2; | |
64 | } while (len > 1); | |
65 | if (len) | |
66 | if ((*a ^ *b) & 0xf0) | |
67 | return 0; | |
68 | return 1; | |
69 | } | |
70 | ||
71 | static int find_short_packed_object(int len, const unsigned char *match, unsigned char *sha1) | |
72 | { | |
73 | struct packed_git *p; | |
99a19b43 JH |
74 | unsigned char found_sha1[20]; |
75 | int found = 0; | |
9938af6a JH |
76 | |
77 | prepare_packed_git(); | |
99a19b43 | 78 | for (p = packed_git; p && found < 2; p = p->next) { |
9938af6a JH |
79 | unsigned num = num_packed_objects(p); |
80 | unsigned first = 0, last = num; | |
81 | while (first < last) { | |
82 | unsigned mid = (first + last) / 2; | |
83 | unsigned char now[20]; | |
84 | int cmp; | |
85 | ||
86 | nth_packed_object_sha1(p, mid, now); | |
a89fccd2 | 87 | cmp = hashcmp(match, now); |
9938af6a JH |
88 | if (!cmp) { |
89 | first = mid; | |
90 | break; | |
91 | } | |
92 | if (cmp > 0) { | |
93 | first = mid+1; | |
94 | continue; | |
95 | } | |
96 | last = mid; | |
97 | } | |
98 | if (first < num) { | |
0bc45890 | 99 | unsigned char now[20], next[20]; |
9938af6a JH |
100 | nth_packed_object_sha1(p, first, now); |
101 | if (match_sha(len, match, now)) { | |
0bc45890 JH |
102 | if (nth_packed_object_sha1(p, first+1, next) || |
103 | !match_sha(len, match, next)) { | |
104 | /* unique within this pack */ | |
105 | if (!found) { | |
e702496e | 106 | hashcpy(found_sha1, now); |
0bc45890 JH |
107 | found++; |
108 | } | |
a89fccd2 | 109 | else if (hashcmp(found_sha1, now)) { |
0bc45890 JH |
110 | found = 2; |
111 | break; | |
112 | } | |
99a19b43 | 113 | } |
0bc45890 JH |
114 | else { |
115 | /* not even unique within this pack */ | |
99a19b43 JH |
116 | found = 2; |
117 | break; | |
9938af6a JH |
118 | } |
119 | } | |
120 | } | |
121 | } | |
99a19b43 | 122 | if (found == 1) |
e702496e | 123 | hashcpy(sha1, found_sha1); |
99a19b43 JH |
124 | return found; |
125 | } | |
126 | ||
013f276e JH |
127 | #define SHORT_NAME_NOT_FOUND (-1) |
128 | #define SHORT_NAME_AMBIGUOUS (-2) | |
129 | ||
99a19b43 JH |
130 | static int find_unique_short_object(int len, char *canonical, |
131 | unsigned char *res, unsigned char *sha1) | |
132 | { | |
133 | int has_unpacked, has_packed; | |
134 | unsigned char unpacked_sha1[20], packed_sha1[20]; | |
135 | ||
136 | has_unpacked = find_short_object_filename(len, canonical, unpacked_sha1); | |
137 | has_packed = find_short_packed_object(len, res, packed_sha1); | |
138 | if (!has_unpacked && !has_packed) | |
013f276e | 139 | return SHORT_NAME_NOT_FOUND; |
99a19b43 | 140 | if (1 < has_unpacked || 1 < has_packed) |
013f276e | 141 | return SHORT_NAME_AMBIGUOUS; |
99a19b43 | 142 | if (has_unpacked != has_packed) { |
e702496e | 143 | hashcpy(sha1, (has_packed ? packed_sha1 : unpacked_sha1)); |
99a19b43 JH |
144 | return 0; |
145 | } | |
146 | /* Both have unique ones -- do they match? */ | |
a89fccd2 | 147 | if (hashcmp(packed_sha1, unpacked_sha1)) |
e974c9ab | 148 | return SHORT_NAME_AMBIGUOUS; |
e702496e | 149 | hashcpy(sha1, packed_sha1); |
9938af6a JH |
150 | return 0; |
151 | } | |
152 | ||
013f276e JH |
153 | static int get_short_sha1(const char *name, int len, unsigned char *sha1, |
154 | int quietly) | |
9938af6a | 155 | { |
013f276e | 156 | int i, status; |
9938af6a JH |
157 | char canonical[40]; |
158 | unsigned char res[20]; | |
159 | ||
8a83157e | 160 | if (len < MINIMUM_ABBREV || len > 40) |
af61c6e0 | 161 | return -1; |
a8e0d16d | 162 | hashclr(res); |
9938af6a | 163 | memset(canonical, 'x', 40); |
af61c6e0 | 164 | for (i = 0; i < len ;i++) { |
9938af6a JH |
165 | unsigned char c = name[i]; |
166 | unsigned char val; | |
9938af6a JH |
167 | if (c >= '0' && c <= '9') |
168 | val = c - '0'; | |
169 | else if (c >= 'a' && c <= 'f') | |
170 | val = c - 'a' + 10; | |
171 | else if (c >= 'A' && c <='F') { | |
172 | val = c - 'A' + 10; | |
173 | c -= 'A' - 'a'; | |
174 | } | |
175 | else | |
176 | return -1; | |
177 | canonical[i] = c; | |
178 | if (!(i & 1)) | |
179 | val <<= 4; | |
180 | res[i >> 1] |= val; | |
181 | } | |
99a19b43 | 182 | |
013f276e JH |
183 | status = find_unique_short_object(i, canonical, res, sha1); |
184 | if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) | |
185 | return error("short SHA1 %.*s is ambiguous.", len, canonical); | |
186 | return status; | |
187 | } | |
188 | ||
189 | const char *find_unique_abbrev(const unsigned char *sha1, int len) | |
190 | { | |
297a1aad | 191 | int status, is_null; |
013f276e | 192 | static char hex[41]; |
47dd0d59 | 193 | |
0bef57ee | 194 | is_null = is_null_sha1(sha1); |
013f276e | 195 | memcpy(hex, sha1_to_hex(sha1), 40); |
02c5cba2 | 196 | if (len == 40 || !len) |
47dd0d59 | 197 | return hex; |
013f276e JH |
198 | while (len < 40) { |
199 | unsigned char sha1_ret[20]; | |
200 | status = get_short_sha1(hex, len, sha1_ret, 1); | |
297a1aad JH |
201 | if (!status || |
202 | (is_null && status != SHORT_NAME_AMBIGUOUS)) { | |
013f276e JH |
203 | hex[len] = 0; |
204 | return hex; | |
205 | } | |
206 | if (status != SHORT_NAME_AMBIGUOUS) | |
207 | return NULL; | |
208 | len++; | |
209 | } | |
210 | return NULL; | |
9938af6a JH |
211 | } |
212 | ||
6677c466 | 213 | static int ambiguous_path(const char *path, int len) |
af13cdf2 LT |
214 | { |
215 | int slash = 1; | |
6677c466 | 216 | int cnt; |
af13cdf2 | 217 | |
6677c466 | 218 | for (cnt = 0; cnt < len; cnt++) { |
af13cdf2 LT |
219 | switch (*path++) { |
220 | case '\0': | |
221 | break; | |
222 | case '/': | |
223 | if (slash) | |
224 | break; | |
225 | slash = 1; | |
226 | continue; | |
227 | case '.': | |
228 | continue; | |
229 | default: | |
230 | slash = 0; | |
231 | continue; | |
232 | } | |
c054d64e | 233 | break; |
af13cdf2 | 234 | } |
6677c466 | 235 | return slash; |
af13cdf2 LT |
236 | } |
237 | ||
9938af6a JH |
238 | static int get_sha1_basic(const char *str, int len, unsigned char *sha1) |
239 | { | |
c51d1369 | 240 | static const char *fmt[] = { |
84a9b58c | 241 | "%.*s", |
c51d1369 JH |
242 | "refs/%.*s", |
243 | "refs/tags/%.*s", | |
244 | "refs/heads/%.*s", | |
245 | "refs/remotes/%.*s", | |
246 | "refs/remotes/%.*s/HEAD", | |
9938af6a JH |
247 | NULL |
248 | }; | |
d556fae2 | 249 | static const char *warning = "warning: refname '%.*s' is ambiguous.\n"; |
ed378ec7 LT |
250 | const char **p, *ref; |
251 | char *real_ref = NULL; | |
ab2a1a32 JH |
252 | int refs_found = 0; |
253 | int at, reflog_len; | |
c51d1369 JH |
254 | unsigned char *this_result; |
255 | unsigned char sha1_from_ref[20]; | |
9938af6a | 256 | |
3c3852e3 | 257 | if (len == 40 && !get_sha1_hex(str, sha1)) |
9938af6a JH |
258 | return 0; |
259 | ||
ab2a1a32 | 260 | /* basic@{time or number} format to query ref-log */ |
694500ed | 261 | reflog_len = at = 0; |
ab2a1a32 JH |
262 | if (str[len-1] == '}') { |
263 | for (at = 1; at < len - 1; at++) { | |
264 | if (str[at] == '@' && str[at+1] == '{') { | |
265 | reflog_len = (len-1) - (at+2); | |
266 | len = at; | |
267 | break; | |
268 | } | |
d556fae2 SP |
269 | } |
270 | } | |
271 | ||
af13cdf2 | 272 | /* Accept only unambiguous ref paths. */ |
6677c466 | 273 | if (ambiguous_path(str, len)) |
af13cdf2 LT |
274 | return -1; |
275 | ||
c51d1369 | 276 | for (p = fmt; *p; p++) { |
d556fae2 | 277 | this_result = refs_found ? sha1_from_ref : sha1; |
8da19775 | 278 | ref = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL); |
ed378ec7 | 279 | if (ref) { |
d556fae2 | 280 | if (!refs_found++) |
ed378ec7 | 281 | real_ref = xstrdup(ref); |
d556fae2 SP |
282 | if (!warn_ambiguous_refs) |
283 | break; | |
2f8acdb3 | 284 | } |
6677c466 | 285 | } |
d556fae2 SP |
286 | |
287 | if (!refs_found) | |
288 | return -1; | |
289 | ||
290 | if (warn_ambiguous_refs && refs_found > 1) | |
291 | fprintf(stderr, warning, len, str); | |
292 | ||
ab2a1a32 JH |
293 | if (reflog_len) { |
294 | /* Is it asking for N-th entry, or approxidate? */ | |
295 | int nth, i; | |
296 | unsigned long at_time; | |
297 | for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { | |
298 | char ch = str[at+2+i]; | |
299 | if ('0' <= ch && ch <= '9') | |
300 | nth = nth * 10 + ch - '0'; | |
301 | else | |
302 | nth = -1; | |
303 | } | |
304 | if (0 <= nth) | |
305 | at_time = 0; | |
306 | else | |
307 | at_time = approxidate(str + at + 2); | |
308 | read_ref_at(real_ref, at_time, nth, sha1); | |
d556fae2 SP |
309 | } |
310 | ||
ed378ec7 | 311 | free(real_ref); |
d556fae2 | 312 | return 0; |
9938af6a JH |
313 | } |
314 | ||
315 | static int get_sha1_1(const char *name, int len, unsigned char *sha1); | |
316 | ||
317 | static int get_parent(const char *name, int len, | |
318 | unsigned char *result, int idx) | |
319 | { | |
320 | unsigned char sha1[20]; | |
321 | int ret = get_sha1_1(name, len, sha1); | |
322 | struct commit *commit; | |
323 | struct commit_list *p; | |
324 | ||
325 | if (ret) | |
326 | return ret; | |
327 | commit = lookup_commit_reference(sha1); | |
328 | if (!commit) | |
329 | return -1; | |
330 | if (parse_commit(commit)) | |
331 | return -1; | |
332 | if (!idx) { | |
e702496e | 333 | hashcpy(result, commit->object.sha1); |
9938af6a JH |
334 | return 0; |
335 | } | |
336 | p = commit->parents; | |
337 | while (p) { | |
338 | if (!--idx) { | |
e702496e | 339 | hashcpy(result, p->item->object.sha1); |
9938af6a JH |
340 | return 0; |
341 | } | |
342 | p = p->next; | |
343 | } | |
344 | return -1; | |
345 | } | |
346 | ||
4f7599ac JH |
347 | static int get_nth_ancestor(const char *name, int len, |
348 | unsigned char *result, int generation) | |
349 | { | |
350 | unsigned char sha1[20]; | |
351 | int ret = get_sha1_1(name, len, sha1); | |
352 | if (ret) | |
353 | return ret; | |
354 | ||
355 | while (generation--) { | |
356 | struct commit *commit = lookup_commit_reference(sha1); | |
357 | ||
358 | if (!commit || parse_commit(commit) || !commit->parents) | |
359 | return -1; | |
e702496e | 360 | hashcpy(sha1, commit->parents->item->object.sha1); |
4f7599ac | 361 | } |
e702496e | 362 | hashcpy(result, sha1); |
4f7599ac JH |
363 | return 0; |
364 | } | |
365 | ||
5385f52d JH |
366 | static int peel_onion(const char *name, int len, unsigned char *sha1) |
367 | { | |
368 | unsigned char outer[20]; | |
369 | const char *sp; | |
885a86ab | 370 | unsigned int expected_type = 0; |
5385f52d JH |
371 | struct object *o; |
372 | ||
373 | /* | |
374 | * "ref^{type}" dereferences ref repeatedly until you cannot | |
375 | * dereference anymore, or you get an object of given type, | |
376 | * whichever comes first. "ref^{}" means just dereference | |
377 | * tags until you get a non-tag. "ref^0" is a shorthand for | |
378 | * "ref^{commit}". "commit^{tree}" could be used to find the | |
379 | * top-level tree of the given commit. | |
380 | */ | |
381 | if (len < 4 || name[len-1] != '}') | |
382 | return -1; | |
383 | ||
384 | for (sp = name + len - 1; name <= sp; sp--) { | |
385 | int ch = *sp; | |
386 | if (ch == '{' && name < sp && sp[-1] == '^') | |
387 | break; | |
388 | } | |
389 | if (sp <= name) | |
390 | return -1; | |
391 | ||
392 | sp++; /* beginning of type name, or closing brace for empty */ | |
393 | if (!strncmp(commit_type, sp, 6) && sp[6] == '}') | |
1974632c | 394 | expected_type = OBJ_COMMIT; |
5385f52d | 395 | else if (!strncmp(tree_type, sp, 4) && sp[4] == '}') |
1974632c | 396 | expected_type = OBJ_TREE; |
5385f52d | 397 | else if (!strncmp(blob_type, sp, 4) && sp[4] == '}') |
1974632c | 398 | expected_type = OBJ_BLOB; |
5385f52d | 399 | else if (sp[0] == '}') |
1974632c | 400 | expected_type = OBJ_NONE; |
5385f52d JH |
401 | else |
402 | return -1; | |
403 | ||
404 | if (get_sha1_1(name, sp - name - 2, outer)) | |
405 | return -1; | |
406 | ||
407 | o = parse_object(outer); | |
408 | if (!o) | |
409 | return -1; | |
885a86ab | 410 | if (!expected_type) { |
9534f40b | 411 | o = deref_tag(o, name, sp - name - 2); |
6e1c6c10 JH |
412 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
413 | return -1; | |
e702496e | 414 | hashcpy(sha1, o->sha1); |
5385f52d JH |
415 | } |
416 | else { | |
417 | /* At this point, the syntax look correct, so | |
418 | * if we do not get the needed object, we should | |
419 | * barf. | |
420 | */ | |
421 | ||
422 | while (1) { | |
6e1c6c10 | 423 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
5385f52d | 424 | return -1; |
885a86ab | 425 | if (o->type == expected_type) { |
e702496e | 426 | hashcpy(sha1, o->sha1); |
5385f52d JH |
427 | return 0; |
428 | } | |
1974632c | 429 | if (o->type == OBJ_TAG) |
5385f52d | 430 | o = ((struct tag*) o)->tagged; |
1974632c | 431 | else if (o->type == OBJ_COMMIT) |
5385f52d JH |
432 | o = &(((struct commit *) o)->tree->object); |
433 | else | |
434 | return error("%.*s: expected %s type, but the object dereferences to %s type", | |
885a86ab LT |
435 | len, name, typename(expected_type), |
436 | typename(o->type)); | |
5385f52d JH |
437 | if (!o->parsed) |
438 | parse_object(o->sha1); | |
439 | } | |
440 | } | |
441 | return 0; | |
442 | } | |
443 | ||
7dd45e15 JH |
444 | static int get_describe_name(const char *name, int len, unsigned char *sha1) |
445 | { | |
446 | const char *cp; | |
447 | ||
448 | for (cp = name + len - 1; name + 2 <= cp; cp--) { | |
449 | char ch = *cp; | |
450 | if (hexval(ch) & ~0377) { | |
451 | /* We must be looking at g in "SOMETHING-g" | |
452 | * for it to be describe output. | |
453 | */ | |
454 | if (ch == 'g' && cp[-1] == '-') { | |
455 | cp++; | |
456 | len -= cp - name; | |
457 | return get_short_sha1(cp, len, sha1, 1); | |
458 | } | |
459 | } | |
460 | } | |
461 | return -1; | |
462 | } | |
463 | ||
9938af6a JH |
464 | static int get_sha1_1(const char *name, int len, unsigned char *sha1) |
465 | { | |
0601dbe1 | 466 | int ret, has_suffix; |
4f7599ac | 467 | const char *cp; |
9938af6a | 468 | |
4f7599ac | 469 | /* "name~3" is "name^^^", |
4f7599ac | 470 | * "name~" and "name~0" are name -- not "name^0"! |
0601dbe1 | 471 | * "name^" is not "name^0"; it is "name^1". |
4f7599ac | 472 | */ |
0601dbe1 | 473 | has_suffix = 0; |
4f7599ac JH |
474 | for (cp = name + len - 1; name <= cp; cp--) { |
475 | int ch = *cp; | |
476 | if ('0' <= ch && ch <= '9') | |
477 | continue; | |
0601dbe1 JH |
478 | if (ch == '~' || ch == '^') |
479 | has_suffix = ch; | |
4f7599ac JH |
480 | break; |
481 | } | |
0601dbe1 JH |
482 | |
483 | if (has_suffix) { | |
484 | int num = 0; | |
4f7599ac JH |
485 | int len1 = cp - name; |
486 | cp++; | |
487 | while (cp < name + len) | |
0601dbe1 JH |
488 | num = num * 10 + *cp++ - '0'; |
489 | if (has_suffix == '^') { | |
490 | if (!num && len1 == len - 1) | |
491 | num = 1; | |
492 | return get_parent(name, len1, sha1, num); | |
493 | } | |
494 | /* else if (has_suffix == '~') -- goes without saying */ | |
495 | return get_nth_ancestor(name, len1, sha1, num); | |
4f7599ac JH |
496 | } |
497 | ||
5385f52d JH |
498 | ret = peel_onion(name, len, sha1); |
499 | if (!ret) | |
500 | return 0; | |
501 | ||
9938af6a JH |
502 | ret = get_sha1_basic(name, len, sha1); |
503 | if (!ret) | |
504 | return 0; | |
7dd45e15 JH |
505 | |
506 | /* It could be describe output that is "SOMETHING-gXXXX" */ | |
507 | ret = get_describe_name(name, len, sha1); | |
508 | if (!ret) | |
509 | return 0; | |
510 | ||
013f276e | 511 | return get_short_sha1(name, len, sha1, 0); |
9938af6a JH |
512 | } |
513 | ||
514 | /* | |
515 | * This is like "get_sha1_basic()", except it allows "sha1 expressions", | |
516 | * notably "xyz^" for "parent of xyz" | |
517 | */ | |
518 | int get_sha1(const char *name, unsigned char *sha1) | |
519 | { | |
cce91a2c | 520 | int ret, bracket_depth; |
041a7308 | 521 | unsigned unused; |
73b0e5af JH |
522 | int namelen = strlen(name); |
523 | const char *cp; | |
5119602a | 524 | |
99a19b43 | 525 | prepare_alt_odb(); |
73b0e5af JH |
526 | ret = get_sha1_1(name, namelen, sha1); |
527 | if (!ret) | |
528 | return ret; | |
529 | /* sha1:path --> object name of path in ent sha1 | |
530 | * :path -> object name of path in index | |
531 | * :[0-3]:path -> object name of path in index at stage | |
532 | */ | |
533 | if (name[0] == ':') { | |
534 | int stage = 0; | |
535 | struct cache_entry *ce; | |
536 | int pos; | |
537 | if (namelen < 3 || | |
538 | name[2] != ':' || | |
539 | name[1] < '0' || '3' < name[1]) | |
540 | cp = name + 1; | |
541 | else { | |
542 | stage = name[1] - '0'; | |
543 | cp = name + 3; | |
5119602a | 544 | } |
73b0e5af JH |
545 | namelen = namelen - (cp - name); |
546 | if (!active_cache) | |
547 | read_cache(); | |
548 | if (active_nr < 0) | |
549 | return -1; | |
550 | pos = cache_name_pos(cp, namelen); | |
551 | if (pos < 0) | |
552 | pos = -pos - 1; | |
553 | while (pos < active_nr) { | |
554 | ce = active_cache[pos]; | |
555 | if (ce_namelen(ce) != namelen || | |
556 | memcmp(ce->name, cp, namelen)) | |
557 | break; | |
558 | if (ce_stage(ce) == stage) { | |
e702496e | 559 | hashcpy(sha1, ce->sha1); |
73b0e5af JH |
560 | return 0; |
561 | } | |
e7cef45f | 562 | pos++; |
73b0e5af JH |
563 | } |
564 | return -1; | |
565 | } | |
cce91a2c SP |
566 | for (cp = name, bracket_depth = 0; *cp; cp++) { |
567 | if (*cp == '{') | |
568 | bracket_depth++; | |
569 | else if (bracket_depth && *cp == '}') | |
570 | bracket_depth--; | |
571 | else if (!bracket_depth && *cp == ':') | |
572 | break; | |
573 | } | |
574 | if (*cp == ':') { | |
73b0e5af JH |
575 | unsigned char tree_sha1[20]; |
576 | if (!get_sha1_1(name, cp-name, tree_sha1)) | |
577 | return get_tree_entry(tree_sha1, cp+1, sha1, | |
578 | &unused); | |
5119602a LT |
579 | } |
580 | return ret; | |
9938af6a | 581 | } |