]>
Commit | Line | Data |
---|---|---|
9938af6a | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
5385f52d | 3 | #include "tag.h" |
9938af6a | 4 | #include "commit.h" |
5385f52d JH |
5 | #include "tree.h" |
6 | #include "blob.h" | |
f3ab49db | 7 | #include "tree-walk.h" |
d556fae2 | 8 | #include "refs.h" |
28fb8438 | 9 | #include "remote.h" |
dbe44faa | 10 | #include "dir.h" |
fad6b9e5 | 11 | #include "sha1-array.h" |
0317f455 | 12 | #include "packfile.h" |
9938af6a | 13 | |
e82caf38 | 14 | static int get_oid_oneline(const char *, struct object_id *, struct commit_list *); |
32574b68 | 15 | |
d2b7d9c7 | 16 | typedef int (*disambiguate_hint_fn)(const struct object_id *, void *); |
a78fafe7 JH |
17 | |
18 | struct disambiguate_state { | |
0016043b | 19 | int len; /* length of prefix in hex chars */ |
dc01505f | 20 | char hex_pfx[GIT_MAX_HEXSZ + 1]; |
d2ee1185 | 21 | struct object_id bin_pfx; |
0016043b | 22 | |
a78fafe7 JH |
23 | disambiguate_hint_fn fn; |
24 | void *cb_data; | |
d2ee1185 | 25 | struct object_id candidate; |
a78fafe7 JH |
26 | unsigned candidate_exists:1; |
27 | unsigned candidate_checked:1; | |
28 | unsigned candidate_ok:1; | |
29 | unsigned disambiguate_fn_used:1; | |
30 | unsigned ambiguous:1; | |
957d7406 | 31 | unsigned always_call_fn:1; |
a78fafe7 JH |
32 | }; |
33 | ||
d2b7d9c7 | 34 | static void update_candidates(struct disambiguate_state *ds, const struct object_id *current) |
a78fafe7 | 35 | { |
957d7406 JH |
36 | if (ds->always_call_fn) { |
37 | ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0; | |
38 | return; | |
39 | } | |
a78fafe7 JH |
40 | if (!ds->candidate_exists) { |
41 | /* this is the first candidate */ | |
d2b7d9c7 | 42 | oidcpy(&ds->candidate, current); |
a78fafe7 JH |
43 | ds->candidate_exists = 1; |
44 | return; | |
d2b7d9c7 | 45 | } else if (!oidcmp(&ds->candidate, current)) { |
a78fafe7 JH |
46 | /* the same as what we already have seen */ |
47 | return; | |
48 | } | |
49 | ||
50 | if (!ds->fn) { | |
51 | /* cannot disambiguate between ds->candidate and current */ | |
52 | ds->ambiguous = 1; | |
53 | return; | |
54 | } | |
55 | ||
56 | if (!ds->candidate_checked) { | |
d2b7d9c7 | 57 | ds->candidate_ok = ds->fn(&ds->candidate, ds->cb_data); |
a78fafe7 JH |
58 | ds->disambiguate_fn_used = 1; |
59 | ds->candidate_checked = 1; | |
60 | } | |
61 | ||
62 | if (!ds->candidate_ok) { | |
749f763d | 63 | /* discard the candidate; we know it does not satisfy fn */ |
d2b7d9c7 | 64 | oidcpy(&ds->candidate, current); |
a78fafe7 JH |
65 | ds->candidate_checked = 0; |
66 | return; | |
67 | } | |
68 | ||
69 | /* if we reach this point, we know ds->candidate satisfies fn */ | |
70 | if (ds->fn(current, ds->cb_data)) { | |
71 | /* | |
72 | * if both current and candidate satisfy fn, we cannot | |
73 | * disambiguate. | |
74 | */ | |
75 | ds->candidate_ok = 0; | |
76 | ds->ambiguous = 1; | |
77 | } | |
78 | ||
79 | /* otherwise, current can be discarded and candidate is still good */ | |
80 | } | |
81 | ||
cc817ca3 RS |
82 | static int append_loose_object(const struct object_id *oid, const char *path, |
83 | void *data) | |
84 | { | |
85 | oid_array_append(data, oid); | |
86 | return 0; | |
87 | } | |
88 | ||
89 | static int match_sha(unsigned, const unsigned char *, const unsigned char *); | |
90 | ||
0016043b | 91 | static void find_short_object_filename(struct disambiguate_state *ds) |
9938af6a | 92 | { |
cc817ca3 | 93 | int subdir_nr = ds->bin_pfx.hash[0]; |
99a19b43 | 94 | struct alternate_object_database *alt; |
99a19b43 JH |
95 | static struct alternate_object_database *fakeent; |
96 | ||
97 | if (!fakeent) { | |
274ac009 JH |
98 | /* |
99 | * Create a "fake" alternate object database that | |
100 | * points to our own object database, to make it | |
101 | * easier to get a temporary working space in | |
102 | * alt->name/alt->base while iterating over the | |
103 | * object databases including our own. | |
104 | */ | |
7f0fa2c0 | 105 | fakeent = alloc_alt_odb(get_object_directory()); |
99a19b43 JH |
106 | } |
107 | fakeent->next = alt_odb_list; | |
9938af6a | 108 | |
a78fafe7 | 109 | for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) { |
cc817ca3 RS |
110 | int pos; |
111 | ||
112 | if (!alt->loose_objects_subdir_seen[subdir_nr]) { | |
113 | struct strbuf *buf = alt_scratch_buf(alt); | |
cc817ca3 RS |
114 | for_each_file_in_obj_subdir(subdir_nr, buf, |
115 | append_loose_object, | |
116 | NULL, NULL, | |
117 | &alt->loose_objects_cache); | |
118 | alt->loose_objects_subdir_seen[subdir_nr] = 1; | |
119 | } | |
a78fafe7 | 120 | |
cc817ca3 RS |
121 | pos = oid_array_lookup(&alt->loose_objects_cache, &ds->bin_pfx); |
122 | if (pos < 0) | |
123 | pos = -1 - pos; | |
124 | while (!ds->ambiguous && pos < alt->loose_objects_cache.nr) { | |
125 | const struct object_id *oid; | |
126 | oid = alt->loose_objects_cache.oid + pos; | |
127 | if (!match_sha(ds->len, ds->bin_pfx.hash, oid->hash)) | |
128 | break; | |
129 | update_candidates(ds, oid); | |
130 | pos++; | |
9938af6a | 131 | } |
9938af6a | 132 | } |
9938af6a JH |
133 | } |
134 | ||
135 | static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b) | |
136 | { | |
137 | do { | |
138 | if (*a != *b) | |
139 | return 0; | |
140 | a++; | |
141 | b++; | |
142 | len -= 2; | |
143 | } while (len > 1); | |
144 | if (len) | |
145 | if ((*a ^ *b) & 0xf0) | |
146 | return 0; | |
147 | return 1; | |
148 | } | |
149 | ||
0016043b | 150 | static void unique_in_pack(struct packed_git *p, |
a78fafe7 | 151 | struct disambiguate_state *ds) |
9938af6a | 152 | { |
f703e6ea | 153 | uint32_t num, last, i, first = 0; |
d2b7d9c7 | 154 | const struct object_id *current = NULL; |
f703e6ea JH |
155 | |
156 | open_pack_index(p); | |
157 | num = p->num_objects; | |
158 | last = num; | |
159 | while (first < last) { | |
160 | uint32_t mid = (first + last) / 2; | |
161 | const unsigned char *current; | |
162 | int cmp; | |
163 | ||
164 | current = nth_packed_object_sha1(p, mid); | |
d2ee1185 | 165 | cmp = hashcmp(ds->bin_pfx.hash, current); |
f703e6ea JH |
166 | if (!cmp) { |
167 | first = mid; | |
168 | break; | |
9938af6a | 169 | } |
f703e6ea JH |
170 | if (cmp > 0) { |
171 | first = mid+1; | |
172 | continue; | |
9938af6a | 173 | } |
f703e6ea JH |
174 | last = mid; |
175 | } | |
176 | ||
177 | /* | |
178 | * At this point, "first" is the location of the lowest object | |
1703f9aa | 179 | * with an object name that could match "bin_pfx". See if we have |
f703e6ea JH |
180 | * 0, 1 or more objects that actually match(es). |
181 | */ | |
a78fafe7 | 182 | for (i = first; i < num && !ds->ambiguous; i++) { |
d2b7d9c7 | 183 | struct object_id oid; |
184 | current = nth_packed_object_oid(&oid, p, i); | |
185 | if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash)) | |
f703e6ea | 186 | break; |
a78fafe7 | 187 | update_candidates(ds, current); |
9938af6a | 188 | } |
f703e6ea JH |
189 | } |
190 | ||
0016043b | 191 | static void find_short_packed_object(struct disambiguate_state *ds) |
9938af6a JH |
192 | { |
193 | struct packed_git *p; | |
194 | ||
195 | prepare_packed_git(); | |
a78fafe7 | 196 | for (p = packed_git; p && !ds->ambiguous; p = p->next) |
0016043b | 197 | unique_in_pack(p, ds); |
99a19b43 JH |
198 | } |
199 | ||
013f276e JH |
200 | #define SHORT_NAME_NOT_FOUND (-1) |
201 | #define SHORT_NAME_AMBIGUOUS (-2) | |
202 | ||
a78fafe7 | 203 | static int finish_object_disambiguation(struct disambiguate_state *ds, |
e82caf38 | 204 | struct object_id *oid) |
99a19b43 | 205 | { |
a78fafe7 JH |
206 | if (ds->ambiguous) |
207 | return SHORT_NAME_AMBIGUOUS; | |
99a19b43 | 208 | |
a78fafe7 | 209 | if (!ds->candidate_exists) |
013f276e | 210 | return SHORT_NAME_NOT_FOUND; |
a78fafe7 JH |
211 | |
212 | if (!ds->candidate_checked) | |
213 | /* | |
214 | * If this is the only candidate, there is no point | |
215 | * calling the disambiguation hint callback. | |
216 | * | |
217 | * On the other hand, if the current candidate | |
218 | * replaced an earlier candidate that did _not_ pass | |
219 | * the disambiguation hint callback, then we do have | |
220 | * more than one objects that match the short name | |
221 | * given, so we should make sure this one matches; | |
222 | * otherwise, if we discovered this one and the one | |
223 | * that we previously discarded in the reverse order, | |
224 | * we would end up showing different results in the | |
225 | * same repository! | |
226 | */ | |
227 | ds->candidate_ok = (!ds->disambiguate_fn_used || | |
d2b7d9c7 | 228 | ds->fn(&ds->candidate, ds->cb_data)); |
a78fafe7 JH |
229 | |
230 | if (!ds->candidate_ok) | |
013f276e | 231 | return SHORT_NAME_AMBIGUOUS; |
a78fafe7 | 232 | |
e82caf38 | 233 | oidcpy(oid, &ds->candidate); |
9938af6a JH |
234 | return 0; |
235 | } | |
236 | ||
d2b7d9c7 | 237 | static int disambiguate_commit_only(const struct object_id *oid, void *cb_data_unused) |
aa1dec9e | 238 | { |
d2b7d9c7 | 239 | int kind = sha1_object_info(oid->hash, NULL); |
aa1dec9e JH |
240 | return kind == OBJ_COMMIT; |
241 | } | |
242 | ||
d2b7d9c7 | 243 | static int disambiguate_committish_only(const struct object_id *oid, void *cb_data_unused) |
e2643617 JH |
244 | { |
245 | struct object *obj; | |
246 | int kind; | |
247 | ||
d2b7d9c7 | 248 | kind = sha1_object_info(oid->hash, NULL); |
e2643617 JH |
249 | if (kind == OBJ_COMMIT) |
250 | return 1; | |
251 | if (kind != OBJ_TAG) | |
99a19b43 | 252 | return 0; |
e2643617 JH |
253 | |
254 | /* We need to do this the hard way... */ | |
c251c83d | 255 | obj = deref_tag(parse_object(oid), NULL, 0); |
e2643617 JH |
256 | if (obj && obj->type == OBJ_COMMIT) |
257 | return 1; | |
9938af6a JH |
258 | return 0; |
259 | } | |
260 | ||
d2b7d9c7 | 261 | static int disambiguate_tree_only(const struct object_id *oid, void *cb_data_unused) |
9938af6a | 262 | { |
d2b7d9c7 | 263 | int kind = sha1_object_info(oid->hash, NULL); |
daba53ae JH |
264 | return kind == OBJ_TREE; |
265 | } | |
9938af6a | 266 | |
d2b7d9c7 | 267 | static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_unused) |
daba53ae JH |
268 | { |
269 | struct object *obj; | |
270 | int kind; | |
271 | ||
d2b7d9c7 | 272 | kind = sha1_object_info(oid->hash, NULL); |
daba53ae JH |
273 | if (kind == OBJ_TREE || kind == OBJ_COMMIT) |
274 | return 1; | |
275 | if (kind != OBJ_TAG) | |
276 | return 0; | |
277 | ||
278 | /* We need to do this the hard way... */ | |
c251c83d | 279 | obj = deref_tag(parse_object(oid), NULL, 0); |
daba53ae JH |
280 | if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT)) |
281 | return 1; | |
282 | return 0; | |
283 | } | |
284 | ||
d2b7d9c7 | 285 | static int disambiguate_blob_only(const struct object_id *oid, void *cb_data_unused) |
daba53ae | 286 | { |
d2b7d9c7 | 287 | int kind = sha1_object_info(oid->hash, NULL); |
daba53ae JH |
288 | return kind == OBJ_BLOB; |
289 | } | |
290 | ||
5b33cb1f JK |
291 | static disambiguate_hint_fn default_disambiguate_hint; |
292 | ||
293 | int set_disambiguate_hint_config(const char *var, const char *value) | |
294 | { | |
295 | static const struct { | |
296 | const char *name; | |
297 | disambiguate_hint_fn fn; | |
298 | } hints[] = { | |
299 | { "none", NULL }, | |
300 | { "commit", disambiguate_commit_only }, | |
301 | { "committish", disambiguate_committish_only }, | |
302 | { "tree", disambiguate_tree_only }, | |
303 | { "treeish", disambiguate_treeish_only }, | |
304 | { "blob", disambiguate_blob_only } | |
305 | }; | |
306 | int i; | |
307 | ||
308 | if (!value) | |
309 | return config_error_nonbool(var); | |
310 | ||
311 | for (i = 0; i < ARRAY_SIZE(hints); i++) { | |
312 | if (!strcasecmp(value, hints[i].name)) { | |
313 | default_disambiguate_hint = hints[i].fn; | |
314 | return 0; | |
315 | } | |
316 | } | |
317 | ||
318 | return error("unknown hint type for '%s': %s", var, value); | |
319 | } | |
320 | ||
0016043b JK |
321 | static int init_object_disambiguation(const char *name, int len, |
322 | struct disambiguate_state *ds) | |
9938af6a | 323 | { |
957d7406 | 324 | int i; |
9938af6a | 325 | |
0016043b JK |
326 | if (len < MINIMUM_ABBREV || len > GIT_SHA1_HEXSZ) |
327 | return -1; | |
328 | ||
329 | memset(ds, 0, sizeof(*ds)); | |
0016043b | 330 | |
af61c6e0 | 331 | for (i = 0; i < len ;i++) { |
9938af6a JH |
332 | unsigned char c = name[i]; |
333 | unsigned char val; | |
9938af6a JH |
334 | if (c >= '0' && c <= '9') |
335 | val = c - '0'; | |
336 | else if (c >= 'a' && c <= 'f') | |
337 | val = c - 'a' + 10; | |
338 | else if (c >= 'A' && c <='F') { | |
339 | val = c - 'A' + 10; | |
340 | c -= 'A' - 'a'; | |
341 | } | |
342 | else | |
343 | return -1; | |
0016043b | 344 | ds->hex_pfx[i] = c; |
9938af6a JH |
345 | if (!(i & 1)) |
346 | val <<= 4; | |
d2ee1185 | 347 | ds->bin_pfx.hash[i >> 1] |= val; |
9938af6a | 348 | } |
0016043b JK |
349 | |
350 | ds->len = len; | |
59e4e34f | 351 | ds->hex_pfx[len] = '\0'; |
0016043b | 352 | prepare_alt_odb(); |
957d7406 JH |
353 | return 0; |
354 | } | |
355 | ||
1b7ba794 | 356 | static int show_ambiguous_object(const struct object_id *oid, void *data) |
1ffa26c4 JK |
357 | { |
358 | const struct disambiguate_state *ds = data; | |
359 | struct strbuf desc = STRBUF_INIT; | |
360 | int type; | |
361 | ||
d2b7d9c7 | 362 | |
1b7ba794 | 363 | if (ds->fn && !ds->fn(oid, ds->cb_data)) |
1ffa26c4 JK |
364 | return 0; |
365 | ||
1b7ba794 | 366 | type = sha1_object_info(oid->hash, NULL); |
1ffa26c4 | 367 | if (type == OBJ_COMMIT) { |
bc83266a | 368 | struct commit *commit = lookup_commit(oid); |
1ffa26c4 JK |
369 | if (commit) { |
370 | struct pretty_print_context pp = {0}; | |
371 | pp.date_mode.type = DATE_SHORT; | |
372 | format_commit_message(commit, " %ad - %s", &desc, &pp); | |
373 | } | |
374 | } else if (type == OBJ_TAG) { | |
d3101b53 | 375 | struct tag *tag = lookup_tag(oid); |
1ffa26c4 JK |
376 | if (!parse_tag(tag) && tag->tag) |
377 | strbuf_addf(&desc, " %s", tag->tag); | |
378 | } | |
379 | ||
380 | advise(" %s %s%s", | |
1b7ba794 | 381 | find_unique_abbrev(oid->hash, DEFAULT_ABBREV), |
1ffa26c4 JK |
382 | typename(type) ? typename(type) : "unknown type", |
383 | desc.buf); | |
384 | ||
385 | strbuf_release(&desc); | |
386 | return 0; | |
387 | } | |
388 | ||
e82caf38 | 389 | static int get_short_oid(const char *name, int len, struct object_id *oid, |
957d7406 JH |
390 | unsigned flags) |
391 | { | |
392 | int status; | |
957d7406 | 393 | struct disambiguate_state ds; |
321c89bf | 394 | int quietly = !!(flags & GET_OID_QUIETLY); |
957d7406 | 395 | |
0016043b | 396 | if (init_object_disambiguation(name, len, &ds) < 0) |
957d7406 | 397 | return -1; |
99a19b43 | 398 | |
321c89bf | 399 | if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS)) |
e82caf38 | 400 | die("BUG: multiple get_short_oid disambiguator flags"); |
259942f5 | 401 | |
321c89bf | 402 | if (flags & GET_OID_COMMIT) |
aa1dec9e | 403 | ds.fn = disambiguate_commit_only; |
321c89bf | 404 | else if (flags & GET_OID_COMMITTISH) |
e2643617 | 405 | ds.fn = disambiguate_committish_only; |
321c89bf | 406 | else if (flags & GET_OID_TREE) |
daba53ae | 407 | ds.fn = disambiguate_tree_only; |
321c89bf | 408 | else if (flags & GET_OID_TREEISH) |
daba53ae | 409 | ds.fn = disambiguate_treeish_only; |
321c89bf | 410 | else if (flags & GET_OID_BLOB) |
daba53ae | 411 | ds.fn = disambiguate_blob_only; |
5b33cb1f JK |
412 | else |
413 | ds.fn = default_disambiguate_hint; | |
aa1dec9e | 414 | |
0016043b JK |
415 | find_short_object_filename(&ds); |
416 | find_short_packed_object(&ds); | |
e82caf38 | 417 | status = finish_object_disambiguation(&ds, oid); |
99a19b43 | 418 | |
1ffa26c4 JK |
419 | if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) { |
420 | error(_("short SHA1 %s is ambiguous"), ds.hex_pfx); | |
421 | ||
422 | /* | |
423 | * We may still have ambiguity if we simply saw a series of | |
424 | * candidates that did not satisfy our hint function. In | |
425 | * that case, we still want to show them, so disable the hint | |
426 | * function entirely. | |
427 | */ | |
428 | if (!ds.ambiguous) | |
429 | ds.fn = NULL; | |
430 | ||
431 | advise(_("The candidates are:")); | |
432 | for_each_abbrev(ds.hex_pfx, show_ambiguous_object, &ds); | |
433 | } | |
434 | ||
013f276e JH |
435 | return status; |
436 | } | |
437 | ||
d2b7d9c7 | 438 | static int collect_ambiguous(const struct object_id *oid, void *data) |
fad6b9e5 | 439 | { |
910650d2 | 440 | oid_array_append(data, oid); |
fad6b9e5 JK |
441 | return 0; |
442 | } | |
443 | ||
957d7406 JH |
444 | int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data) |
445 | { | |
910650d2 | 446 | struct oid_array collect = OID_ARRAY_INIT; |
957d7406 | 447 | struct disambiguate_state ds; |
fad6b9e5 | 448 | int ret; |
957d7406 | 449 | |
0016043b | 450 | if (init_object_disambiguation(prefix, strlen(prefix), &ds) < 0) |
957d7406 | 451 | return -1; |
957d7406 | 452 | |
957d7406 | 453 | ds.always_call_fn = 1; |
fad6b9e5 JK |
454 | ds.fn = collect_ambiguous; |
455 | ds.cb_data = &collect; | |
0016043b JK |
456 | find_short_object_filename(&ds); |
457 | find_short_packed_object(&ds); | |
fad6b9e5 | 458 | |
910650d2 | 459 | ret = oid_array_for_each_unique(&collect, fn, cb_data); |
460 | oid_array_clear(&collect); | |
fad6b9e5 | 461 | return ret; |
957d7406 JH |
462 | } |
463 | ||
8e3f52d7 JK |
464 | /* |
465 | * Return the slot of the most-significant bit set in "val". There are various | |
466 | * ways to do this quickly with fls() or __builtin_clzl(), but speed is | |
467 | * probably not a big deal here. | |
468 | */ | |
469 | static unsigned msb(unsigned long val) | |
470 | { | |
471 | unsigned r = 0; | |
472 | while (val >>= 1) | |
473 | r++; | |
474 | return r; | |
475 | } | |
476 | ||
af49c6d0 | 477 | int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len) |
013f276e | 478 | { |
b66fde9a | 479 | int status, exists; |
47dd0d59 | 480 | |
e6c587c7 | 481 | if (len < 0) { |
8e3f52d7 JK |
482 | unsigned long count = approximate_object_count(); |
483 | /* | |
484 | * Add one because the MSB only tells us the highest bit set, | |
485 | * not including the value of all the _other_ bits (so "15" | |
486 | * is only one off of 2^4, but the MSB is the 3rd bit. | |
487 | */ | |
488 | len = msb(count) + 1; | |
489 | /* | |
490 | * We now know we have on the order of 2^len objects, which | |
491 | * expects a collision at 2^(len/2). But we also care about hex | |
492 | * chars, not bits, and there are 4 bits per hex. So all | |
42c78a21 | 493 | * together we need to divide by 2 and round up. |
8e3f52d7 | 494 | */ |
42c78a21 | 495 | len = DIV_ROUND_UP(len, 2); |
8e3f52d7 JK |
496 | /* |
497 | * For very small repos, we stick with our regular fallback. | |
498 | */ | |
499 | if (len < FALLBACK_DEFAULT_ABBREV) | |
500 | len = FALLBACK_DEFAULT_ABBREV; | |
e6c587c7 | 501 | } |
8e3f52d7 | 502 | |
af49c6d0 | 503 | sha1_to_hex_r(hex, sha1); |
ac53fe86 | 504 | if (len == GIT_SHA1_HEXSZ || !len) |
505 | return GIT_SHA1_HEXSZ; | |
61e704e3 | 506 | exists = has_sha1_file(sha1); |
ac53fe86 | 507 | while (len < GIT_SHA1_HEXSZ) { |
e82caf38 | 508 | struct object_id oid_ret; |
321c89bf | 509 | status = get_short_oid(hex, len, &oid_ret, GET_OID_QUIETLY); |
b66fde9a JH |
510 | if (exists |
511 | ? !status | |
512 | : status == SHORT_NAME_NOT_FOUND) { | |
ea2c69ed | 513 | hex[len] = 0; |
af49c6d0 | 514 | return len; |
013f276e | 515 | } |
013f276e JH |
516 | len++; |
517 | } | |
af49c6d0 JK |
518 | return len; |
519 | } | |
520 | ||
521 | const char *find_unique_abbrev(const unsigned char *sha1, int len) | |
522 | { | |
ef2ed501 | 523 | static int bufno; |
dc01505f | 524 | static char hexbuffer[4][GIT_MAX_HEXSZ + 1]; |
3e98919a RS |
525 | char *hex = hexbuffer[bufno]; |
526 | bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer); | |
af49c6d0 | 527 | find_unique_abbrev_r(hex, sha1, len); |
b66fde9a | 528 | return hex; |
9938af6a JH |
529 | } |
530 | ||
6677c466 | 531 | static int ambiguous_path(const char *path, int len) |
af13cdf2 LT |
532 | { |
533 | int slash = 1; | |
6677c466 | 534 | int cnt; |
af13cdf2 | 535 | |
6677c466 | 536 | for (cnt = 0; cnt < len; cnt++) { |
af13cdf2 LT |
537 | switch (*path++) { |
538 | case '\0': | |
539 | break; | |
540 | case '/': | |
541 | if (slash) | |
542 | break; | |
543 | slash = 1; | |
544 | continue; | |
545 | case '.': | |
546 | continue; | |
547 | default: | |
548 | slash = 0; | |
549 | continue; | |
550 | } | |
c054d64e | 551 | break; |
af13cdf2 | 552 | } |
6677c466 | 553 | return slash; |
af13cdf2 LT |
554 | } |
555 | ||
a1ad0eb0 JK |
556 | static inline int at_mark(const char *string, int len, |
557 | const char **suffix, int nr) | |
ae0ba8e2 | 558 | { |
ae0ba8e2 JH |
559 | int i; |
560 | ||
a1ad0eb0 | 561 | for (i = 0; i < nr; i++) { |
ae0ba8e2 JH |
562 | int suffix_len = strlen(suffix[i]); |
563 | if (suffix_len <= len | |
244ea1b5 | 564 | && !strncasecmp(string, suffix[i], suffix_len)) |
ae0ba8e2 JH |
565 | return suffix_len; |
566 | } | |
567 | return 0; | |
568 | } | |
569 | ||
a1ad0eb0 JK |
570 | static inline int upstream_mark(const char *string, int len) |
571 | { | |
572 | const char *suffix[] = { "@{upstream}", "@{u}" }; | |
573 | return at_mark(string, len, suffix, ARRAY_SIZE(suffix)); | |
574 | } | |
575 | ||
adfe5d04 JK |
576 | static inline int push_mark(const char *string, int len) |
577 | { | |
578 | const char *suffix[] = { "@{push}" }; | |
579 | return at_mark(string, len, suffix, ARRAY_SIZE(suffix)); | |
580 | } | |
581 | ||
e82caf38 | 582 | static int get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags); |
8cd4249c | 583 | static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf); |
d18ba221 | 584 | |
e82caf38 | 585 | static int get_oid_basic(const char *str, int len, struct object_id *oid, |
c41a87dd | 586 | unsigned int flags) |
e86eb666 | 587 | { |
eedce784 | 588 | static const char *warn_msg = "refname '%.*s' is ambiguous."; |
798c35fc NTND |
589 | static const char *object_name_msg = N_( |
590 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
591 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
592 | "may be created by mistake. For example,\n" | |
593 | "\n" | |
594 | " git checkout -b $br $(git rev-parse ...)\n" | |
595 | "\n" | |
596 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
597 | "examine these refs and maybe delete them. Turn this message off by\n" | |
8dc84fdc | 598 | "running \"git config advice.objectNameWarning false\""); |
e82caf38 | 599 | struct object_id tmp_oid; |
ed378ec7 | 600 | char *real_ref = NULL; |
ab2a1a32 | 601 | int refs_found = 0; |
128fd54d | 602 | int at, reflog_len, nth_prior = 0; |
9938af6a | 603 | |
e82caf38 | 604 | if (len == GIT_SHA1_HEXSZ && !get_oid_hex(str, oid)) { |
832cf74c | 605 | if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) { |
e82caf38 | 606 | refs_found = dwim_ref(str, len, tmp_oid.hash, &real_ref); |
832cf74c | 607 | if (refs_found > 0) { |
25fba78d JK |
608 | warning(warn_msg, len, str); |
609 | if (advice_object_name_warning) | |
610 | fprintf(stderr, "%s\n", _(object_name_msg)); | |
611 | } | |
612 | free(real_ref); | |
798c35fc | 613 | } |
9938af6a | 614 | return 0; |
798c35fc | 615 | } |
9938af6a | 616 | |
d18ba221 | 617 | /* basic@{time or number or -number} format to query ref-log */ |
694500ed | 618 | reflog_len = at = 0; |
f265458f | 619 | if (len && str[len-1] == '}') { |
e883a057 | 620 | for (at = len-4; at >= 0; at--) { |
ab2a1a32 | 621 | if (str[at] == '@' && str[at+1] == '{') { |
83d16bc7 RR |
622 | if (str[at+2] == '-') { |
623 | if (at != 0) | |
624 | /* @{-N} not at start */ | |
625 | return -1; | |
128fd54d FC |
626 | nth_prior = 1; |
627 | continue; | |
628 | } | |
adfe5d04 JK |
629 | if (!upstream_mark(str + at, len - at) && |
630 | !push_mark(str + at, len - at)) { | |
28fb8438 JS |
631 | reflog_len = (len-1) - (at+2); |
632 | len = at; | |
633 | } | |
ab2a1a32 JH |
634 | break; |
635 | } | |
d556fae2 SP |
636 | } |
637 | } | |
638 | ||
af13cdf2 | 639 | /* Accept only unambiguous ref paths. */ |
11cf8801 | 640 | if (len && ambiguous_path(str, len)) |
af13cdf2 LT |
641 | return -1; |
642 | ||
128fd54d | 643 | if (nth_prior) { |
d18ba221 | 644 | struct strbuf buf = STRBUF_INIT; |
128fd54d FC |
645 | int detached; |
646 | ||
8cd4249c | 647 | if (interpret_nth_prior_checkout(str, len, &buf) > 0) { |
e82caf38 | 648 | detached = (buf.len == GIT_SHA1_HEXSZ && !get_oid_hex(buf.buf, oid)); |
128fd54d FC |
649 | strbuf_release(&buf); |
650 | if (detached) | |
651 | return 0; | |
d18ba221 | 652 | } |
128fd54d FC |
653 | } |
654 | ||
655 | if (!len && reflog_len) | |
11cf8801 | 656 | /* allow "@{...}" to mean the current branch reflog */ |
e82caf38 | 657 | refs_found = dwim_ref("HEAD", 4, oid->hash, &real_ref); |
128fd54d | 658 | else if (reflog_len) |
e82caf38 | 659 | refs_found = dwim_log(str, len, oid->hash, &real_ref); |
f2eba66d | 660 | else |
e82caf38 | 661 | refs_found = dwim_ref(str, len, oid->hash, &real_ref); |
d556fae2 SP |
662 | |
663 | if (!refs_found) | |
664 | return -1; | |
665 | ||
321c89bf | 666 | if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) && |
798c35fc | 667 | (refs_found > 1 || |
321c89bf | 668 | !get_short_oid(str, len, &tmp_oid, GET_OID_QUIETLY))) |
eedce784 | 669 | warning(warn_msg, len, str); |
d556fae2 | 670 | |
ab2a1a32 | 671 | if (reflog_len) { |
ab2a1a32 | 672 | int nth, i; |
dddbad72 JS |
673 | timestamp_t at_time; |
674 | timestamp_t co_time; | |
16d7cc90 JH |
675 | int co_tz, co_cnt; |
676 | ||
fe558516 | 677 | /* Is it asking for N-th entry, or approxidate? */ |
ab2a1a32 JH |
678 | for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { |
679 | char ch = str[at+2+i]; | |
680 | if ('0' <= ch && ch <= '9') | |
681 | nth = nth * 10 + ch - '0'; | |
682 | else | |
683 | nth = -1; | |
684 | } | |
ea360dd0 SP |
685 | if (100000000 <= nth) { |
686 | at_time = nth; | |
687 | nth = -1; | |
688 | } else if (0 <= nth) | |
ab2a1a32 | 689 | at_time = 0; |
861f00e3 | 690 | else { |
93cfa7c7 | 691 | int errors = 0; |
861f00e3 | 692 | char *tmp = xstrndup(str + at + 2, reflog_len); |
93cfa7c7 | 693 | at_time = approxidate_careful(tmp, &errors); |
861f00e3 | 694 | free(tmp); |
28b35632 JK |
695 | if (errors) { |
696 | free(real_ref); | |
a5e10acb | 697 | return -1; |
28b35632 | 698 | } |
861f00e3 | 699 | } |
e82caf38 | 700 | if (read_ref_at(real_ref, flags, at_time, nth, oid->hash, NULL, |
16d7cc90 | 701 | &co_time, &co_tz, &co_cnt)) { |
305ebea0 | 702 | if (!len) { |
59556548 | 703 | if (starts_with(real_ref, "refs/heads/")) { |
305ebea0 RR |
704 | str = real_ref + 11; |
705 | len = strlen(real_ref + 11); | |
706 | } else { | |
707 | /* detached HEAD */ | |
708 | str = "HEAD"; | |
709 | len = 4; | |
710 | } | |
711 | } | |
c41a87dd | 712 | if (at_time) { |
321c89bf | 713 | if (!(flags & GET_OID_QUIETLY)) { |
c41a87dd DA |
714 | warning("Log for '%.*s' only goes " |
715 | "back to %s.", len, str, | |
a5481a6c | 716 | show_date(co_time, co_tz, DATE_MODE(RFC2822))); |
c41a87dd DA |
717 | } |
718 | } else { | |
321c89bf | 719 | if (flags & GET_OID_QUIETLY) { |
c41a87dd DA |
720 | exit(128); |
721 | } | |
e6eedc31 JS |
722 | die("Log for '%.*s' only has %d entries.", |
723 | len, str, co_cnt); | |
724 | } | |
16d7cc90 | 725 | } |
d556fae2 SP |
726 | } |
727 | ||
ed378ec7 | 728 | free(real_ref); |
d556fae2 | 729 | return 0; |
9938af6a JH |
730 | } |
731 | ||
9938af6a | 732 | static int get_parent(const char *name, int len, |
e82caf38 | 733 | struct object_id *result, int idx) |
9938af6a | 734 | { |
1e43ed98 | 735 | struct object_id oid; |
321c89bf | 736 | int ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH); |
9938af6a JH |
737 | struct commit *commit; |
738 | struct commit_list *p; | |
739 | ||
740 | if (ret) | |
741 | return ret; | |
bc83266a | 742 | commit = lookup_commit_reference(&oid); |
9938af6a JH |
743 | if (parse_commit(commit)) |
744 | return -1; | |
745 | if (!idx) { | |
e82caf38 | 746 | oidcpy(result, &commit->object.oid); |
9938af6a JH |
747 | return 0; |
748 | } | |
749 | p = commit->parents; | |
750 | while (p) { | |
751 | if (!--idx) { | |
e82caf38 | 752 | oidcpy(result, &p->item->object.oid); |
9938af6a JH |
753 | return 0; |
754 | } | |
755 | p = p->next; | |
756 | } | |
757 | return -1; | |
758 | } | |
759 | ||
4f7599ac | 760 | static int get_nth_ancestor(const char *name, int len, |
e82caf38 | 761 | struct object_id *result, int generation) |
4f7599ac | 762 | { |
1e43ed98 | 763 | struct object_id oid; |
621ff675 LT |
764 | struct commit *commit; |
765 | int ret; | |
766 | ||
321c89bf | 767 | ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH); |
4f7599ac JH |
768 | if (ret) |
769 | return ret; | |
bc83266a | 770 | commit = lookup_commit_reference(&oid); |
621ff675 LT |
771 | if (!commit) |
772 | return -1; | |
4f7599ac JH |
773 | |
774 | while (generation--) { | |
621ff675 | 775 | if (parse_commit(commit) || !commit->parents) |
4f7599ac | 776 | return -1; |
621ff675 | 777 | commit = commit->parents->item; |
4f7599ac | 778 | } |
e82caf38 | 779 | oidcpy(result, &commit->object.oid); |
4f7599ac JH |
780 | return 0; |
781 | } | |
782 | ||
81776315 JH |
783 | struct object *peel_to_type(const char *name, int namelen, |
784 | struct object *o, enum object_type expected_type) | |
785 | { | |
786 | if (name && !namelen) | |
787 | namelen = strlen(name); | |
81776315 | 788 | while (1) { |
c251c83d | 789 | if (!o || (!o->parsed && !parse_object(&o->oid))) |
81776315 | 790 | return NULL; |
a6a3f2cc | 791 | if (expected_type == OBJ_ANY || o->type == expected_type) |
81776315 JH |
792 | return o; |
793 | if (o->type == OBJ_TAG) | |
794 | o = ((struct tag*) o)->tagged; | |
795 | else if (o->type == OBJ_COMMIT) | |
796 | o = &(((struct commit *) o)->tree->object); | |
797 | else { | |
798 | if (name) | |
799 | error("%.*s: expected %s type, but the object " | |
800 | "dereferences to %s type", | |
801 | namelen, name, typename(expected_type), | |
802 | typename(o->type)); | |
803 | return NULL; | |
804 | } | |
805 | } | |
806 | } | |
807 | ||
e82caf38 | 808 | static int peel_onion(const char *name, int len, struct object_id *oid, |
8a10fea4 | 809 | unsigned lookup_flags) |
5385f52d | 810 | { |
de37d50d | 811 | struct object_id outer; |
5385f52d | 812 | const char *sp; |
885a86ab | 813 | unsigned int expected_type = 0; |
5385f52d JH |
814 | struct object *o; |
815 | ||
816 | /* | |
817 | * "ref^{type}" dereferences ref repeatedly until you cannot | |
818 | * dereference anymore, or you get an object of given type, | |
819 | * whichever comes first. "ref^{}" means just dereference | |
820 | * tags until you get a non-tag. "ref^0" is a shorthand for | |
821 | * "ref^{commit}". "commit^{tree}" could be used to find the | |
822 | * top-level tree of the given commit. | |
823 | */ | |
824 | if (len < 4 || name[len-1] != '}') | |
825 | return -1; | |
826 | ||
827 | for (sp = name + len - 1; name <= sp; sp--) { | |
828 | int ch = *sp; | |
829 | if (ch == '{' && name < sp && sp[-1] == '^') | |
830 | break; | |
831 | } | |
832 | if (sp <= name) | |
833 | return -1; | |
834 | ||
835 | sp++; /* beginning of type name, or closing brace for empty */ | |
59556548 | 836 | if (starts_with(sp, "commit}")) |
1974632c | 837 | expected_type = OBJ_COMMIT; |
59556548 | 838 | else if (starts_with(sp, "tag}")) |
75aa26d3 | 839 | expected_type = OBJ_TAG; |
59556548 | 840 | else if (starts_with(sp, "tree}")) |
1974632c | 841 | expected_type = OBJ_TREE; |
59556548 | 842 | else if (starts_with(sp, "blob}")) |
1974632c | 843 | expected_type = OBJ_BLOB; |
59556548 | 844 | else if (starts_with(sp, "object}")) |
a6a3f2cc | 845 | expected_type = OBJ_ANY; |
5385f52d | 846 | else if (sp[0] == '}') |
1974632c | 847 | expected_type = OBJ_NONE; |
32574b68 NTND |
848 | else if (sp[0] == '/') |
849 | expected_type = OBJ_COMMIT; | |
5385f52d JH |
850 | else |
851 | return -1; | |
852 | ||
321c89bf | 853 | lookup_flags &= ~GET_OID_DISAMBIGUATORS; |
e2643617 | 854 | if (expected_type == OBJ_COMMIT) |
321c89bf | 855 | lookup_flags |= GET_OID_COMMITTISH; |
ed1ca602 | 856 | else if (expected_type == OBJ_TREE) |
321c89bf | 857 | lookup_flags |= GET_OID_TREEISH; |
e2643617 | 858 | |
e82caf38 | 859 | if (get_oid_1(name, sp - name - 2, &outer, lookup_flags)) |
5385f52d JH |
860 | return -1; |
861 | ||
c251c83d | 862 | o = parse_object(&outer); |
5385f52d JH |
863 | if (!o) |
864 | return -1; | |
885a86ab | 865 | if (!expected_type) { |
9534f40b | 866 | o = deref_tag(o, name, sp - name - 2); |
c251c83d | 867 | if (!o || (!o->parsed && !parse_object(&o->oid))) |
6e1c6c10 | 868 | return -1; |
e82caf38 | 869 | oidcpy(oid, &o->oid); |
32574b68 | 870 | return 0; |
5385f52d | 871 | } |
32574b68 NTND |
872 | |
873 | /* | |
874 | * At this point, the syntax look correct, so | |
875 | * if we do not get the needed object, we should | |
876 | * barf. | |
877 | */ | |
878 | o = peel_to_type(name, len, o, expected_type); | |
879 | if (!o) | |
81776315 | 880 | return -1; |
32574b68 | 881 | |
e82caf38 | 882 | oidcpy(oid, &o->oid); |
32574b68 NTND |
883 | if (sp[0] == '/') { |
884 | /* "$commit^{/foo}" */ | |
885 | char *prefix; | |
886 | int ret; | |
887 | struct commit_list *list = NULL; | |
888 | ||
81776315 | 889 | /* |
4322842a NTND |
890 | * $commit^{/}. Some regex implementation may reject. |
891 | * We don't need regex anyway. '' pattern always matches. | |
5385f52d | 892 | */ |
4322842a | 893 | if (sp[1] == '}') |
81776315 | 894 | return 0; |
4322842a | 895 | |
32574b68 NTND |
896 | prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1)); |
897 | commit_list_insert((struct commit *)o, &list); | |
e82caf38 | 898 | ret = get_oid_oneline(prefix, oid, list); |
32574b68 NTND |
899 | free(prefix); |
900 | return ret; | |
5385f52d JH |
901 | } |
902 | return 0; | |
903 | } | |
904 | ||
e82caf38 | 905 | static int get_describe_name(const char *name, int len, struct object_id *oid) |
7dd45e15 JH |
906 | { |
907 | const char *cp; | |
321c89bf | 908 | unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT; |
7dd45e15 JH |
909 | |
910 | for (cp = name + len - 1; name + 2 <= cp; cp--) { | |
911 | char ch = *cp; | |
6f75d45b | 912 | if (!isxdigit(ch)) { |
7dd45e15 JH |
913 | /* We must be looking at g in "SOMETHING-g" |
914 | * for it to be describe output. | |
915 | */ | |
916 | if (ch == 'g' && cp[-1] == '-') { | |
917 | cp++; | |
918 | len -= cp - name; | |
e82caf38 | 919 | return get_short_oid(cp, len, oid, flags); |
7dd45e15 JH |
920 | } |
921 | } | |
922 | } | |
923 | return -1; | |
924 | } | |
925 | ||
e82caf38 | 926 | static int get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags) |
9938af6a | 927 | { |
0601dbe1 | 928 | int ret, has_suffix; |
4f7599ac | 929 | const char *cp; |
9938af6a | 930 | |
621ff675 LT |
931 | /* |
932 | * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1". | |
4f7599ac | 933 | */ |
0601dbe1 | 934 | has_suffix = 0; |
4f7599ac JH |
935 | for (cp = name + len - 1; name <= cp; cp--) { |
936 | int ch = *cp; | |
937 | if ('0' <= ch && ch <= '9') | |
938 | continue; | |
0601dbe1 JH |
939 | if (ch == '~' || ch == '^') |
940 | has_suffix = ch; | |
4f7599ac JH |
941 | break; |
942 | } | |
0601dbe1 JH |
943 | |
944 | if (has_suffix) { | |
945 | int num = 0; | |
4f7599ac JH |
946 | int len1 = cp - name; |
947 | cp++; | |
948 | while (cp < name + len) | |
0601dbe1 | 949 | num = num * 10 + *cp++ - '0'; |
621ff675 LT |
950 | if (!num && len1 == len - 1) |
951 | num = 1; | |
952 | if (has_suffix == '^') | |
e82caf38 | 953 | return get_parent(name, len1, oid, num); |
0601dbe1 | 954 | /* else if (has_suffix == '~') -- goes without saying */ |
e82caf38 | 955 | return get_nth_ancestor(name, len1, oid, num); |
4f7599ac JH |
956 | } |
957 | ||
e82caf38 | 958 | ret = peel_onion(name, len, oid, lookup_flags); |
5385f52d JH |
959 | if (!ret) |
960 | return 0; | |
961 | ||
e82caf38 | 962 | ret = get_oid_basic(name, len, oid, lookup_flags); |
9938af6a JH |
963 | if (!ret) |
964 | return 0; | |
7dd45e15 JH |
965 | |
966 | /* It could be describe output that is "SOMETHING-gXXXX" */ | |
e82caf38 | 967 | ret = get_describe_name(name, len, oid); |
7dd45e15 JH |
968 | if (!ret) |
969 | return 0; | |
970 | ||
e82caf38 | 971 | return get_short_oid(name, len, oid, lookup_flags); |
9938af6a JH |
972 | } |
973 | ||
f7bff003 JH |
974 | /* |
975 | * This interprets names like ':/Initial revision of "git"' by searching | |
976 | * through history and returning the first commit whose message starts | |
3d045897 | 977 | * the given regular expression. |
f7bff003 | 978 | * |
0769854f WP |
979 | * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'. |
980 | * | |
981 | * For a literal '!' character at the beginning of a pattern, you have to repeat | |
982 | * that, like: ':/!!foo' | |
983 | * | |
984 | * For future extension, all other sequences beginning with ':/!' are reserved. | |
f7bff003 | 985 | */ |
208acbfb NTND |
986 | |
987 | /* Remember to update object flag allocation in object.h */ | |
f7bff003 JH |
988 | #define ONELINE_SEEN (1u<<20) |
989 | ||
9c5fe0b8 MH |
990 | static int handle_one_ref(const char *path, const struct object_id *oid, |
991 | int flag, void *cb_data) | |
28a4d940 JS |
992 | { |
993 | struct commit_list **list = cb_data; | |
c251c83d | 994 | struct object *object = parse_object(oid); |
28a4d940 JS |
995 | if (!object) |
996 | return 0; | |
affeef12 | 997 | if (object->type == OBJ_TAG) { |
28a4d940 | 998 | object = deref_tag(object, path, strlen(path)); |
affeef12 MK |
999 | if (!object) |
1000 | return 0; | |
1001 | } | |
28a4d940 JS |
1002 | if (object->type != OBJ_COMMIT) |
1003 | return 0; | |
e8d1dfe6 | 1004 | commit_list_insert((struct commit *)object, list); |
28a4d940 JS |
1005 | return 0; |
1006 | } | |
1007 | ||
e82caf38 | 1008 | static int get_oid_oneline(const char *prefix, struct object_id *oid, |
84baa31b | 1009 | struct commit_list *list) |
28a4d940 | 1010 | { |
84baa31b | 1011 | struct commit_list *backup = NULL, *l; |
28042dbc | 1012 | int found = 0; |
0769854f | 1013 | int negative = 0; |
57895105 | 1014 | regex_t regex; |
28a4d940 JS |
1015 | |
1016 | if (prefix[0] == '!') { | |
28a4d940 | 1017 | prefix++; |
0769854f WP |
1018 | |
1019 | if (prefix[0] == '-') { | |
1020 | prefix++; | |
1021 | negative = 1; | |
1022 | } else if (prefix[0] != '!') { | |
e6a6a768 | 1023 | return -1; |
0769854f | 1024 | } |
28a4d940 | 1025 | } |
57895105 LT |
1026 | |
1027 | if (regcomp(®ex, prefix, REG_EXTENDED)) | |
aac4fac1 | 1028 | return -1; |
57895105 | 1029 | |
84baa31b NTND |
1030 | for (l = list; l; l = l->next) { |
1031 | l->item->object.flags |= ONELINE_SEEN; | |
28a4d940 | 1032 | commit_list_insert(l->item, &backup); |
84baa31b | 1033 | } |
ed8ad7e2 | 1034 | while (list) { |
ba41c1c9 | 1035 | const char *p, *buf; |
1358e7d6 | 1036 | struct commit *commit; |
28042dbc | 1037 | int matches; |
ed8ad7e2 JM |
1038 | |
1039 | commit = pop_most_recent_commit(&list, ONELINE_SEEN); | |
c251c83d | 1040 | if (!parse_object(&commit->object.oid)) |
283cdbcf | 1041 | continue; |
8597ea3a | 1042 | buf = get_commit_buffer(commit, NULL); |
ba41c1c9 | 1043 | p = strstr(buf, "\n\n"); |
0769854f | 1044 | matches = negative ^ (p && !regexec(®ex, p + 2, 0, NULL, 0)); |
ba41c1c9 | 1045 | unuse_commit_buffer(commit, buf); |
28042dbc JH |
1046 | |
1047 | if (matches) { | |
e82caf38 | 1048 | oidcpy(oid, &commit->object.oid); |
28042dbc | 1049 | found = 1; |
28a4d940 JS |
1050 | break; |
1051 | } | |
1052 | } | |
57895105 | 1053 | regfree(®ex); |
28a4d940 JS |
1054 | free_commit_list(list); |
1055 | for (l = backup; l; l = l->next) | |
1056 | clear_commit_marks(l->item, ONELINE_SEEN); | |
28042dbc JH |
1057 | free_commit_list(backup); |
1058 | return found ? 0 : -1; | |
28a4d940 JS |
1059 | } |
1060 | ||
ae5a6c36 | 1061 | struct grab_nth_branch_switch_cbdata { |
98f85ff4 JH |
1062 | int remaining; |
1063 | struct strbuf buf; | |
ae5a6c36 JH |
1064 | }; |
1065 | ||
9461d272 | 1066 | static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid, |
dddbad72 | 1067 | const char *email, timestamp_t timestamp, int tz, |
ae5a6c36 JH |
1068 | const char *message, void *cb_data) |
1069 | { | |
1070 | struct grab_nth_branch_switch_cbdata *cb = cb_data; | |
a884d0cb TR |
1071 | const char *match = NULL, *target = NULL; |
1072 | size_t len; | |
1073 | ||
95b567c7 | 1074 | if (skip_prefix(message, "checkout: moving from ", &match)) |
d7c03c1f | 1075 | target = strstr(match, " to "); |
ae5a6c36 | 1076 | |
c829774c | 1077 | if (!match || !target) |
ae5a6c36 | 1078 | return 0; |
98f85ff4 JH |
1079 | if (--(cb->remaining) == 0) { |
1080 | len = target - match; | |
1081 | strbuf_reset(&cb->buf); | |
1082 | strbuf_add(&cb->buf, match, len); | |
1083 | return 1; /* we are done */ | |
1084 | } | |
ae5a6c36 JH |
1085 | return 0; |
1086 | } | |
1087 | ||
1088 | /* | |
ae0ba8e2 JH |
1089 | * Parse @{-N} syntax, return the number of characters parsed |
1090 | * if successful; otherwise signal an error with negative value. | |
ae5a6c36 | 1091 | */ |
8cd4249c JK |
1092 | static int interpret_nth_prior_checkout(const char *name, int namelen, |
1093 | struct strbuf *buf) | |
ae5a6c36 | 1094 | { |
c2883e62 | 1095 | long nth; |
98f85ff4 | 1096 | int retval; |
ae5a6c36 | 1097 | struct grab_nth_branch_switch_cbdata cb; |
a884d0cb TR |
1098 | const char *brace; |
1099 | char *num_end; | |
ae5a6c36 | 1100 | |
8cd4249c JK |
1101 | if (namelen < 4) |
1102 | return -1; | |
ae5a6c36 JH |
1103 | if (name[0] != '@' || name[1] != '{' || name[2] != '-') |
1104 | return -1; | |
8cd4249c | 1105 | brace = memchr(name, '}', namelen); |
a884d0cb TR |
1106 | if (!brace) |
1107 | return -1; | |
98f85ff4 | 1108 | nth = strtol(name + 3, &num_end, 10); |
a884d0cb | 1109 | if (num_end != brace) |
ae5a6c36 | 1110 | return -1; |
c2883e62 JH |
1111 | if (nth <= 0) |
1112 | return -1; | |
98f85ff4 JH |
1113 | cb.remaining = nth; |
1114 | strbuf_init(&cb.buf, 20); | |
1115 | ||
39765e59 | 1116 | retval = 0; |
98f85ff4 JH |
1117 | if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) { |
1118 | strbuf_reset(buf); | |
e992d1eb | 1119 | strbuf_addbuf(buf, &cb.buf); |
98f85ff4 JH |
1120 | retval = brace - name + 1; |
1121 | } | |
a884d0cb | 1122 | |
98f85ff4 | 1123 | strbuf_release(&cb.buf); |
39765e59 | 1124 | return retval; |
ae5a6c36 JH |
1125 | } |
1126 | ||
151b2911 | 1127 | int get_oid_mb(const char *name, struct object_id *oid) |
619a644d JH |
1128 | { |
1129 | struct commit *one, *two; | |
1130 | struct commit_list *mbs; | |
151b2911 | 1131 | struct object_id oid_tmp; |
619a644d JH |
1132 | const char *dots; |
1133 | int st; | |
1134 | ||
1135 | dots = strstr(name, "..."); | |
1136 | if (!dots) | |
151b2911 | 1137 | return get_oid(name, oid); |
619a644d | 1138 | if (dots == name) |
151b2911 | 1139 | st = get_oid("HEAD", &oid_tmp); |
619a644d JH |
1140 | else { |
1141 | struct strbuf sb; | |
1142 | strbuf_init(&sb, dots - name); | |
1143 | strbuf_add(&sb, name, dots - name); | |
e82caf38 | 1144 | st = get_oid_committish(sb.buf, &oid_tmp); |
619a644d JH |
1145 | strbuf_release(&sb); |
1146 | } | |
1147 | if (st) | |
1148 | return st; | |
bc83266a | 1149 | one = lookup_commit_reference_gently(&oid_tmp, 0); |
619a644d JH |
1150 | if (!one) |
1151 | return -1; | |
1152 | ||
e82caf38 | 1153 | if (get_oid_committish(dots[3] ? (dots + 3) : "HEAD", &oid_tmp)) |
619a644d | 1154 | return -1; |
bc83266a | 1155 | two = lookup_commit_reference_gently(&oid_tmp, 0); |
619a644d JH |
1156 | if (!two) |
1157 | return -1; | |
2ce406cc | 1158 | mbs = get_merge_bases(one, two); |
619a644d JH |
1159 | if (!mbs || mbs->next) |
1160 | st = -1; | |
1161 | else { | |
1162 | st = 0; | |
151b2911 | 1163 | oidcpy(oid, &mbs->item->object.oid); |
619a644d JH |
1164 | } |
1165 | free_commit_list(mbs); | |
1166 | return st; | |
1167 | } | |
1168 | ||
9ba89f48 FC |
1169 | /* parse @something syntax, when 'something' is not {.*} */ |
1170 | static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf) | |
1171 | { | |
1172 | const char *next; | |
1173 | ||
1174 | if (len || name[1] == '{') | |
1175 | return -1; | |
1176 | ||
1177 | /* make sure it's a single @, or @@{.*}, not @foo */ | |
8cd4249c | 1178 | next = memchr(name + len + 1, '@', namelen - len - 1); |
9ba89f48 FC |
1179 | if (next && next[1] != '{') |
1180 | return -1; | |
1181 | if (!next) | |
1182 | next = name + namelen; | |
1183 | if (next != name + 1) | |
1184 | return -1; | |
1185 | ||
1186 | strbuf_reset(buf); | |
1187 | strbuf_add(buf, "HEAD", 4); | |
1188 | return 1; | |
1189 | } | |
1190 | ||
0e9f62da JK |
1191 | static int reinterpret(const char *name, int namelen, int len, |
1192 | struct strbuf *buf, unsigned allowed) | |
7a0a49a7 FC |
1193 | { |
1194 | /* we have extra data, which might need further processing */ | |
1195 | struct strbuf tmp = STRBUF_INIT; | |
1196 | int used = buf->len; | |
1197 | int ret; | |
1198 | ||
1199 | strbuf_add(buf, name + len, namelen - len); | |
0e9f62da | 1200 | ret = interpret_branch_name(buf->buf, buf->len, &tmp, allowed); |
7a0a49a7 FC |
1201 | /* that data was not interpreted, remove our cruft */ |
1202 | if (ret < 0) { | |
1203 | strbuf_setlen(buf, used); | |
1204 | return len; | |
1205 | } | |
1206 | strbuf_reset(buf); | |
1207 | strbuf_addbuf(buf, &tmp); | |
1208 | strbuf_release(&tmp); | |
1209 | /* tweak for size of {-N} versus expanded ref name */ | |
1210 | return ret - used + len; | |
1211 | } | |
1212 | ||
a39c14af JK |
1213 | static void set_shortened_ref(struct strbuf *buf, const char *ref) |
1214 | { | |
1215 | char *s = shorten_unambiguous_ref(ref, 0); | |
1216 | strbuf_reset(buf); | |
1217 | strbuf_addstr(buf, s); | |
1218 | free(s); | |
1219 | } | |
1220 | ||
0e9f62da JK |
1221 | static int branch_interpret_allowed(const char *refname, unsigned allowed) |
1222 | { | |
1223 | if (!allowed) | |
1224 | return 1; | |
1225 | ||
1226 | if ((allowed & INTERPRET_BRANCH_LOCAL) && | |
1227 | starts_with(refname, "refs/heads/")) | |
1228 | return 1; | |
1229 | if ((allowed & INTERPRET_BRANCH_REMOTE) && | |
1230 | starts_with(refname, "refs/remotes/")) | |
1231 | return 1; | |
1232 | ||
1233 | return 0; | |
1234 | } | |
1235 | ||
48c58471 JK |
1236 | static int interpret_branch_mark(const char *name, int namelen, |
1237 | int at, struct strbuf *buf, | |
1238 | int (*get_mark)(const char *, int), | |
1239 | const char *(*get_data)(struct branch *, | |
0e9f62da JK |
1240 | struct strbuf *), |
1241 | unsigned allowed) | |
a39c14af JK |
1242 | { |
1243 | int len; | |
48c58471 JK |
1244 | struct branch *branch; |
1245 | struct strbuf err = STRBUF_INIT; | |
1246 | const char *value; | |
a39c14af | 1247 | |
48c58471 | 1248 | len = get_mark(name + at, namelen - at); |
a39c14af JK |
1249 | if (!len) |
1250 | return -1; | |
1251 | ||
3f6eb30f JK |
1252 | if (memchr(name, ':', at)) |
1253 | return -1; | |
1254 | ||
48c58471 JK |
1255 | if (at) { |
1256 | char *name_str = xmemdupz(name, at); | |
1257 | branch = branch_get(name_str); | |
1258 | free(name_str); | |
1259 | } else | |
1260 | branch = branch_get(NULL); | |
1261 | ||
1262 | value = get_data(branch, &err); | |
1263 | if (!value) | |
1264 | die("%s", err.buf); | |
1265 | ||
0e9f62da JK |
1266 | if (!branch_interpret_allowed(value, allowed)) |
1267 | return -1; | |
1268 | ||
48c58471 | 1269 | set_shortened_ref(buf, value); |
a39c14af JK |
1270 | return len + at; |
1271 | } | |
1272 | ||
0e9f62da JK |
1273 | int interpret_branch_name(const char *name, int namelen, struct strbuf *buf, |
1274 | unsigned allowed) | |
ae0ba8e2 | 1275 | { |
f278f40f | 1276 | char *at; |
9892d5d4 | 1277 | const char *start; |
13228c30 | 1278 | int len; |
ae0ba8e2 | 1279 | |
cf99a761 FC |
1280 | if (!namelen) |
1281 | namelen = strlen(name); | |
1282 | ||
0e9f62da JK |
1283 | if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) { |
1284 | len = interpret_nth_prior_checkout(name, namelen, buf); | |
1285 | if (!len) { | |
1286 | return len; /* syntax Ok, not enough switches */ | |
1287 | } else if (len > 0) { | |
1288 | if (len == namelen) | |
1289 | return len; /* consumed all */ | |
1290 | else | |
1291 | return reinterpret(name, namelen, len, buf, allowed); | |
1292 | } | |
d46a8301 JK |
1293 | } |
1294 | ||
9892d5d4 JK |
1295 | for (start = name; |
1296 | (at = memchr(start, '@', namelen - (start - name))); | |
1297 | start = at + 1) { | |
9ba89f48 | 1298 | |
0e9f62da JK |
1299 | if (!allowed || (allowed & INTERPRET_BRANCH_HEAD)) { |
1300 | len = interpret_empty_at(name, namelen, at - name, buf); | |
1301 | if (len > 0) | |
1302 | return reinterpret(name, namelen, len, buf, | |
1303 | allowed); | |
1304 | } | |
9ba89f48 | 1305 | |
48c58471 | 1306 | len = interpret_branch_mark(name, namelen, at - name, buf, |
0e9f62da JK |
1307 | upstream_mark, branch_get_upstream, |
1308 | allowed); | |
9892d5d4 JK |
1309 | if (len > 0) |
1310 | return len; | |
adfe5d04 JK |
1311 | |
1312 | len = interpret_branch_mark(name, namelen, at - name, buf, | |
0e9f62da JK |
1313 | push_mark, branch_get_push, |
1314 | allowed); | |
9892d5d4 JK |
1315 | if (len > 0) |
1316 | return len; | |
bb0dab5d | 1317 | } |
9ba89f48 | 1318 | |
a39c14af | 1319 | return -1; |
ae0ba8e2 JH |
1320 | } |
1321 | ||
0e9f62da | 1322 | void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed) |
6bab74e7 JN |
1323 | { |
1324 | int len = strlen(name); | |
0e9f62da | 1325 | int used = interpret_branch_name(name, len, sb, allowed); |
84cf2466 | 1326 | |
84cf2466 JH |
1327 | if (used < 0) |
1328 | used = 0; | |
1329 | strbuf_add(sb, name + used, len - used); | |
6bab74e7 JN |
1330 | } |
1331 | ||
1332 | int strbuf_check_branch_ref(struct strbuf *sb, const char *name) | |
1333 | { | |
7d5c960b | 1334 | strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL); |
6bab74e7 | 1335 | if (name[0] == '-') |
8d9c5010 | 1336 | return -1; |
6bab74e7 | 1337 | strbuf_splice(sb, 0, 0, "refs/heads/", 11); |
8d9c5010 | 1338 | return check_refname_format(sb->buf, 0); |
6bab74e7 JN |
1339 | } |
1340 | ||
9938af6a | 1341 | /* |
e82caf38 | 1342 | * This is like "get_oid_basic()", except it allows "object ID expressions", |
9938af6a JH |
1343 | * notably "xyz^" for "parent of xyz" |
1344 | */ | |
2764fd93 | 1345 | int get_oid(const char *name, struct object_id *oid) |
1346 | { | |
e82caf38 | 1347 | struct object_context unused; |
1348 | return get_oid_with_context(name, 0, oid, &unused); | |
2764fd93 | 1349 | } |
1350 | ||
1351 | ||
cd74e473 | 1352 | /* |
a8a5406a | 1353 | * Many callers know that the user meant to name a commit-ish by |
cd74e473 JH |
1354 | * syntactical positions where the object name appears. Calling this |
1355 | * function allows the machinery to disambiguate shorter-than-unique | |
a8a5406a | 1356 | * abbreviated object names between commit-ish and others. |
cd74e473 JH |
1357 | * |
1358 | * Note that this does NOT error out when the named object is not a | |
a8a5406a | 1359 | * commit-ish. It is merely to give a hint to the disambiguation |
cd74e473 JH |
1360 | * machinery. |
1361 | */ | |
e82caf38 | 1362 | int get_oid_committish(const char *name, struct object_id *oid) |
cd74e473 JH |
1363 | { |
1364 | struct object_context unused; | |
321c89bf | 1365 | return get_oid_with_context(name, GET_OID_COMMITTISH, |
e82caf38 | 1366 | oid, &unused); |
cd74e473 JH |
1367 | } |
1368 | ||
e82caf38 | 1369 | int get_oid_treeish(const char *name, struct object_id *oid) |
daba53ae JH |
1370 | { |
1371 | struct object_context unused; | |
321c89bf | 1372 | return get_oid_with_context(name, GET_OID_TREEISH, |
e82caf38 | 1373 | oid, &unused); |
daba53ae JH |
1374 | } |
1375 | ||
e82caf38 | 1376 | int get_oid_commit(const char *name, struct object_id *oid) |
daba53ae JH |
1377 | { |
1378 | struct object_context unused; | |
321c89bf | 1379 | return get_oid_with_context(name, GET_OID_COMMIT, |
e82caf38 | 1380 | oid, &unused); |
daba53ae JH |
1381 | } |
1382 | ||
e82caf38 | 1383 | int get_oid_tree(const char *name, struct object_id *oid) |
daba53ae JH |
1384 | { |
1385 | struct object_context unused; | |
321c89bf | 1386 | return get_oid_with_context(name, GET_OID_TREE, |
e82caf38 | 1387 | oid, &unused); |
daba53ae JH |
1388 | } |
1389 | ||
e82caf38 | 1390 | int get_oid_blob(const char *name, struct object_id *oid) |
daba53ae JH |
1391 | { |
1392 | struct object_context unused; | |
321c89bf | 1393 | return get_oid_with_context(name, GET_OID_BLOB, |
e82caf38 | 1394 | oid, &unused); |
a0cd87a5 MK |
1395 | } |
1396 | ||
009fee47 | 1397 | /* Must be called only when object_name:filename doesn't exist. */ |
e82caf38 | 1398 | static void diagnose_invalid_oid_path(const char *prefix, |
1399 | const char *filename, | |
1400 | const struct object_id *tree_oid, | |
1401 | const char *object_name, | |
1402 | int object_name_len) | |
009fee47 | 1403 | { |
e82caf38 | 1404 | struct object_id oid; |
009fee47 MM |
1405 | unsigned mode; |
1406 | ||
1407 | if (!prefix) | |
1408 | prefix = ""; | |
1409 | ||
dbe44faa | 1410 | if (file_exists(filename)) |
b2981d06 RS |
1411 | die("Path '%s' exists on disk, but not in '%.*s'.", |
1412 | filename, object_name_len, object_name); | |
c7054209 | 1413 | if (is_missing_file_error(errno)) { |
b2724c87 | 1414 | char *fullname = xstrfmt("%s%s", prefix, filename); |
009fee47 | 1415 | |
e82caf38 | 1416 | if (!get_tree_entry(tree_oid->hash, fullname, |
1417 | oid.hash, &mode)) { | |
009fee47 | 1418 | die("Path '%s' exists, but not '%s'.\n" |
b2981d06 | 1419 | "Did you mean '%.*s:%s' aka '%.*s:./%s'?", |
009fee47 MM |
1420 | fullname, |
1421 | filename, | |
b2981d06 | 1422 | object_name_len, object_name, |
e41d718c | 1423 | fullname, |
b2981d06 | 1424 | object_name_len, object_name, |
e41d718c | 1425 | filename); |
009fee47 | 1426 | } |
b2981d06 RS |
1427 | die("Path '%s' does not exist in '%.*s'", |
1428 | filename, object_name_len, object_name); | |
009fee47 MM |
1429 | } |
1430 | } | |
1431 | ||
1432 | /* Must be called only when :stage:filename doesn't exist. */ | |
1433 | static void diagnose_invalid_index_path(int stage, | |
1434 | const char *prefix, | |
1435 | const char *filename) | |
1436 | { | |
9c5e6c80 | 1437 | const struct cache_entry *ce; |
009fee47 MM |
1438 | int pos; |
1439 | unsigned namelen = strlen(filename); | |
43bb66ae | 1440 | struct strbuf fullname = STRBUF_INIT; |
009fee47 MM |
1441 | |
1442 | if (!prefix) | |
1443 | prefix = ""; | |
1444 | ||
1445 | /* Wrong stage number? */ | |
1446 | pos = cache_name_pos(filename, namelen); | |
1447 | if (pos < 0) | |
1448 | pos = -pos - 1; | |
77e8466f MH |
1449 | if (pos < active_nr) { |
1450 | ce = active_cache[pos]; | |
1451 | if (ce_namelen(ce) == namelen && | |
1452 | !memcmp(ce->name, filename, namelen)) | |
1453 | die("Path '%s' is in the index, but not at stage %d.\n" | |
1454 | "Did you mean ':%d:%s'?", | |
1455 | filename, stage, | |
1456 | ce_stage(ce), filename); | |
1457 | } | |
009fee47 MM |
1458 | |
1459 | /* Confusion between relative and absolute filenames? */ | |
43bb66ae JK |
1460 | strbuf_addstr(&fullname, prefix); |
1461 | strbuf_addstr(&fullname, filename); | |
1462 | pos = cache_name_pos(fullname.buf, fullname.len); | |
009fee47 MM |
1463 | if (pos < 0) |
1464 | pos = -pos - 1; | |
77e8466f MH |
1465 | if (pos < active_nr) { |
1466 | ce = active_cache[pos]; | |
43bb66ae JK |
1467 | if (ce_namelen(ce) == fullname.len && |
1468 | !memcmp(ce->name, fullname.buf, fullname.len)) | |
77e8466f | 1469 | die("Path '%s' is in the index, but not '%s'.\n" |
e41d718c | 1470 | "Did you mean ':%d:%s' aka ':%d:./%s'?", |
43bb66ae JK |
1471 | fullname.buf, filename, |
1472 | ce_stage(ce), fullname.buf, | |
e41d718c | 1473 | ce_stage(ce), filename); |
77e8466f | 1474 | } |
009fee47 | 1475 | |
dbe44faa | 1476 | if (file_exists(filename)) |
009fee47 | 1477 | die("Path '%s' exists on disk, but not in the index.", filename); |
c7054209 | 1478 | if (is_missing_file_error(errno)) |
009fee47 MM |
1479 | die("Path '%s' does not exist (neither on disk nor in the index).", |
1480 | filename); | |
1481 | ||
43bb66ae | 1482 | strbuf_release(&fullname); |
009fee47 MM |
1483 | } |
1484 | ||
1485 | ||
979f7929 NTND |
1486 | static char *resolve_relative_path(const char *rel) |
1487 | { | |
59556548 | 1488 | if (!starts_with(rel, "./") && !starts_with(rel, "../")) |
979f7929 NTND |
1489 | return NULL; |
1490 | ||
979f7929 NTND |
1491 | if (!is_inside_work_tree()) |
1492 | die("relative path syntax can't be used outside working tree."); | |
1493 | ||
1494 | /* die() inside prefix_path() if resolved path is outside worktree */ | |
1495 | return prefix_path(startup_info->prefix, | |
1496 | startup_info->prefix ? strlen(startup_info->prefix) : 0, | |
1497 | rel); | |
1498 | } | |
1499 | ||
e82caf38 | 1500 | static int get_oid_with_context_1(const char *name, |
1501 | unsigned flags, | |
1502 | const char *prefix, | |
1503 | struct object_id *oid, | |
1504 | struct object_context *oc) | |
a0cd87a5 MK |
1505 | { |
1506 | int ret, bracket_depth; | |
73b0e5af JH |
1507 | int namelen = strlen(name); |
1508 | const char *cp; | |
321c89bf | 1509 | int only_to_die = flags & GET_OID_ONLY_TO_DIE; |
5119602a | 1510 | |
7243ffdd | 1511 | if (only_to_die) |
321c89bf | 1512 | flags |= GET_OID_QUIETLY; |
7243ffdd | 1513 | |
573285e5 CP |
1514 | memset(oc, 0, sizeof(*oc)); |
1515 | oc->mode = S_IFINVALID; | |
d72cae12 | 1516 | strbuf_init(&oc->symlink_path, 0); |
e82caf38 | 1517 | ret = get_oid_1(name, namelen, oid, flags); |
73b0e5af JH |
1518 | if (!ret) |
1519 | return ret; | |
33bd598c JH |
1520 | /* |
1521 | * sha1:path --> object name of path in ent sha1 | |
979f7929 NTND |
1522 | * :path -> object name of absolute path in index |
1523 | * :./path -> object name of path relative to cwd in index | |
73b0e5af | 1524 | * :[0-3]:path -> object name of path in index at stage |
95ad6d2d | 1525 | * :/foo -> recent commit matching foo |
73b0e5af JH |
1526 | */ |
1527 | if (name[0] == ':') { | |
1528 | int stage = 0; | |
9c5e6c80 | 1529 | const struct cache_entry *ce; |
979f7929 | 1530 | char *new_path = NULL; |
73b0e5af | 1531 | int pos; |
2e83b66c | 1532 | if (!only_to_die && namelen > 2 && name[1] == '/') { |
84baa31b | 1533 | struct commit_list *list = NULL; |
2b2a5be3 | 1534 | |
84baa31b | 1535 | for_each_ref(handle_one_ref, &list); |
e8d1dfe6 | 1536 | commit_list_sort_by_date(&list); |
e82caf38 | 1537 | return get_oid_oneline(name + 2, oid, list); |
84baa31b | 1538 | } |
73b0e5af JH |
1539 | if (namelen < 3 || |
1540 | name[2] != ':' || | |
1541 | name[1] < '0' || '3' < name[1]) | |
1542 | cp = name + 1; | |
1543 | else { | |
1544 | stage = name[1] - '0'; | |
1545 | cp = name + 3; | |
5119602a | 1546 | } |
3d6e0f74 JH |
1547 | new_path = resolve_relative_path(cp); |
1548 | if (!new_path) { | |
1549 | namelen = namelen - (cp - name); | |
1550 | } else { | |
1551 | cp = new_path; | |
1552 | namelen = strlen(cp); | |
1553 | } | |
573285e5 | 1554 | |
321c89bf | 1555 | if (flags & GET_OID_RECORD_PATH) |
dc944b65 | 1556 | oc->path = xstrdup(cp); |
573285e5 | 1557 | |
73b0e5af JH |
1558 | if (!active_cache) |
1559 | read_cache(); | |
73b0e5af JH |
1560 | pos = cache_name_pos(cp, namelen); |
1561 | if (pos < 0) | |
1562 | pos = -pos - 1; | |
1563 | while (pos < active_nr) { | |
1564 | ce = active_cache[pos]; | |
1565 | if (ce_namelen(ce) != namelen || | |
1566 | memcmp(ce->name, cp, namelen)) | |
1567 | break; | |
1568 | if (ce_stage(ce) == stage) { | |
e82caf38 | 1569 | oidcpy(oid, &ce->oid); |
90064710 | 1570 | oc->mode = ce->ce_mode; |
979f7929 | 1571 | free(new_path); |
73b0e5af JH |
1572 | return 0; |
1573 | } | |
e7cef45f | 1574 | pos++; |
73b0e5af | 1575 | } |
2e83b66c | 1576 | if (only_to_die && name[1] && name[1] != '/') |
009fee47 | 1577 | diagnose_invalid_index_path(stage, prefix, cp); |
979f7929 | 1578 | free(new_path); |
73b0e5af JH |
1579 | return -1; |
1580 | } | |
cce91a2c SP |
1581 | for (cp = name, bracket_depth = 0; *cp; cp++) { |
1582 | if (*cp == '{') | |
1583 | bracket_depth++; | |
1584 | else if (bracket_depth && *cp == '}') | |
1585 | bracket_depth--; | |
1586 | else if (!bracket_depth && *cp == ':') | |
1587 | break; | |
1588 | } | |
1589 | if (*cp == ':') { | |
e82caf38 | 1590 | struct object_id tree_oid; |
b2981d06 | 1591 | int len = cp - name; |
8a10fea4 JK |
1592 | unsigned sub_flags = flags; |
1593 | ||
321c89bf | 1594 | sub_flags &= ~GET_OID_DISAMBIGUATORS; |
1595 | sub_flags |= GET_OID_TREEISH; | |
8a10fea4 | 1596 | |
e82caf38 | 1597 | if (!get_oid_1(name, len, &tree_oid, sub_flags)) { |
009fee47 | 1598 | const char *filename = cp+1; |
979f7929 NTND |
1599 | char *new_filename = NULL; |
1600 | ||
1601 | new_filename = resolve_relative_path(filename); | |
1602 | if (new_filename) | |
1603 | filename = new_filename; | |
321c89bf | 1604 | if (flags & GET_OID_FOLLOW_SYMLINKS) { |
e82caf38 | 1605 | ret = get_tree_entry_follow_symlinks(tree_oid.hash, |
1606 | filename, oid->hash, &oc->symlink_path, | |
c4ec9677 DT |
1607 | &oc->mode); |
1608 | } else { | |
e82caf38 | 1609 | ret = get_tree_entry(tree_oid.hash, filename, |
1610 | oid->hash, &oc->mode); | |
c4ec9677 | 1611 | if (ret && only_to_die) { |
e82caf38 | 1612 | diagnose_invalid_oid_path(prefix, |
c4ec9677 | 1613 | filename, |
e82caf38 | 1614 | &tree_oid, |
c4ec9677 DT |
1615 | name, len); |
1616 | } | |
009fee47 | 1617 | } |
e82caf38 | 1618 | hashcpy(oc->tree, tree_oid.hash); |
321c89bf | 1619 | if (flags & GET_OID_RECORD_PATH) |
dc944b65 | 1620 | oc->path = xstrdup(filename); |
573285e5 | 1621 | |
979f7929 | 1622 | free(new_filename); |
009fee47 MM |
1623 | return ret; |
1624 | } else { | |
2e83b66c | 1625 | if (only_to_die) |
b2981d06 | 1626 | die("Invalid object name '%.*s'.", len, name); |
009fee47 | 1627 | } |
5119602a LT |
1628 | } |
1629 | return ret; | |
9938af6a | 1630 | } |
f01cc14c | 1631 | |
8c135ea2 JH |
1632 | /* |
1633 | * Call this function when you know "name" given by the end user must | |
1634 | * name an object but it doesn't; the function _may_ die with a better | |
1635 | * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not | |
1636 | * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case | |
1637 | * you have a chance to diagnose the error further. | |
1638 | */ | |
1639 | void maybe_die_on_misspelt_object_name(const char *name, const char *prefix) | |
f01cc14c JH |
1640 | { |
1641 | struct object_context oc; | |
e82caf38 | 1642 | struct object_id oid; |
321c89bf | 1643 | get_oid_with_context_1(name, GET_OID_ONLY_TO_DIE, prefix, &oid, &oc); |
8c135ea2 JH |
1644 | } |
1645 | ||
e82caf38 | 1646 | int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc) |
f01cc14c | 1647 | { |
321c89bf | 1648 | if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE) |
c4ec9677 | 1649 | die("BUG: incompatible flags for get_sha1_with_context"); |
e82caf38 | 1650 | return get_oid_with_context_1(str, flags, NULL, oid, oc); |
f01cc14c | 1651 | } |