blob: fdff4601b2c70cc7e4585096534382ddc5024990 [file] [log] [blame]
Junio C Hamano9938af62005-08-03 22:15:49 -07001#include "cache.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07002#include "config.h"
Junio C Hamano5385f522005-10-13 18:57:40 -07003#include "tag.h"
Junio C Hamano9938af62005-08-03 22:15:49 -07004#include "commit.h"
Junio C Hamano5385f522005-10-13 18:57:40 -07005#include "tree.h"
6#include "blob.h"
Junio C Hamanof3ab49d2006-04-19 11:56:53 -07007#include "tree-walk.h"
Shawn Pearced556fae2006-05-17 05:56:09 -04008#include "refs.h"
Johannes Schindelin28fb8432009-09-10 17:25:57 +02009#include "remote.h"
René Scharfedbe44fa2015-05-19 23:44:23 +020010#include "dir.h"
Jeff Kingfe299ec2020-03-30 10:03:46 -040011#include "oid-array.h"
Jonathan Tan0317f452017-08-18 15:20:19 -070012#include "packfile.h"
Stefan Beller0d4a1322018-03-23 18:20:56 +010013#include "object-store.h"
Stefan Beller031dc922018-03-23 18:20:57 +010014#include "repository.h"
Nguyễn Thái Ngọc Duyefe461b2019-04-16 16:33:36 +070015#include "submodule.h"
Derrick Stolee8aac67a2018-07-12 15:39:35 -040016#include "midx.h"
Derrick Stolee64043552018-07-20 16:33:04 +000017#include "commit-reach.h"
Junio C Hamano9938af62005-08-03 22:15:49 -070018
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +070019static int get_oid_oneline(struct repository *r, const char *, struct object_id *, struct commit_list *);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +070020
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070021typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070022
23struct disambiguate_state {
Jeff King00160432016-09-26 08:00:04 -040024 int len; /* length of prefix in hex chars */
brian m. carlsondc015052017-03-26 16:01:24 +000025 char hex_pfx[GIT_MAX_HEXSZ + 1];
brian m. carlsond2ee1182017-03-26 16:01:33 +000026 struct object_id bin_pfx;
Jeff King00160432016-09-26 08:00:04 -040027
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070028 struct repository *repo;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070029 disambiguate_hint_fn fn;
30 void *cb_data;
brian m. carlsond2ee1182017-03-26 16:01:33 +000031 struct object_id candidate;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070032 unsigned candidate_exists:1;
33 unsigned candidate_checked:1;
34 unsigned candidate_ok:1;
35 unsigned disambiguate_fn_used:1;
36 unsigned ambiguous:1;
Junio C Hamano957d7402012-07-03 14:21:59 -070037 unsigned always_call_fn:1;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070038};
39
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000040static void update_candidates(struct disambiguate_state *ds, const struct object_id *current)
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070041{
Junio C Hamano957d7402012-07-03 14:21:59 -070042 if (ds->always_call_fn) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070043 ds->ambiguous = ds->fn(ds->repo, current, ds->cb_data) ? 1 : 0;
Junio C Hamano957d7402012-07-03 14:21:59 -070044 return;
45 }
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070046 if (!ds->candidate_exists) {
47 /* this is the first candidate */
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000048 oidcpy(&ds->candidate, current);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070049 ds->candidate_exists = 1;
50 return;
Jeff King4a7e27e2018-08-28 17:22:40 -040051 } else if (oideq(&ds->candidate, current)) {
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070052 /* the same as what we already have seen */
53 return;
54 }
55
56 if (!ds->fn) {
57 /* cannot disambiguate between ds->candidate and current */
58 ds->ambiguous = 1;
59 return;
60 }
61
62 if (!ds->candidate_checked) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070063 ds->candidate_ok = ds->fn(ds->repo, &ds->candidate, ds->cb_data);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070064 ds->disambiguate_fn_used = 1;
65 ds->candidate_checked = 1;
66 }
67
68 if (!ds->candidate_ok) {
Ondřej Bílka749f7632013-07-22 23:02:23 +020069 /* discard the candidate; we know it does not satisfy fn */
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000070 oidcpy(&ds->candidate, current);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070071 ds->candidate_checked = 0;
72 return;
73 }
74
75 /* if we reach this point, we know ds->candidate satisfies fn */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070076 if (ds->fn(ds->repo, current, ds->cb_data)) {
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070077 /*
78 * if both current and candidate satisfy fn, we cannot
79 * disambiguate.
80 */
81 ds->candidate_ok = 0;
82 ds->ambiguous = 1;
83 }
84
85 /* otherwise, current can be discarded and candidate is still good */
86}
87
Martin Ågren1e6771e2020-12-31 12:56:20 +010088static int match_hash(unsigned, const unsigned char *, const unsigned char *);
René Scharfecc817ca2017-06-22 20:19:48 +020089
Eric Wong92d8ed82021-07-07 23:10:19 +000090static enum cb_next match_prefix(const struct object_id *oid, void *arg)
91{
92 struct disambiguate_state *ds = arg;
93 /* no need to call match_hash, oidtree_each did prefix match */
94 update_candidates(ds, oid);
95 return ds->ambiguous ? CB_BREAK : CB_CONTINUE;
96}
97
Jeff King00160432016-09-26 08:00:04 -040098static void find_short_object_filename(struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -070099{
Jeff King263db402018-11-12 09:48:47 -0500100 struct object_directory *odb;
Junio C Hamano9938af62005-08-03 22:15:49 -0700101
Eric Wong92d8ed82021-07-07 23:10:19 +0000102 for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next)
103 oidtree_each(odb_loose_cache(odb, &ds->bin_pfx),
104 &ds->bin_pfx, ds->len, match_prefix, ds);
Junio C Hamano9938af62005-08-03 22:15:49 -0700105}
106
Martin Ågren1e6771e2020-12-31 12:56:20 +0100107static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b)
Junio C Hamano9938af62005-08-03 22:15:49 -0700108{
109 do {
110 if (*a != *b)
111 return 0;
112 a++;
113 b++;
114 len -= 2;
115 } while (len > 1);
116 if (len)
117 if ((*a ^ *b) & 0xf0)
118 return 0;
119 return 1;
120}
121
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400122static void unique_in_midx(struct multi_pack_index *m,
123 struct disambiguate_state *ds)
124{
125 uint32_t num, i, first = 0;
126 const struct object_id *current = NULL;
127 num = m->num_objects;
128
129 if (!num)
130 return;
131
132 bsearch_midx(&ds->bin_pfx, m, &first);
133
134 /*
135 * At this point, "first" is the location of the lowest object
136 * with an object name that could match "bin_pfx". See if we have
137 * 0, 1 or more objects that actually match(es).
138 */
139 for (i = first; i < num && !ds->ambiguous; i++) {
140 struct object_id oid;
141 current = nth_midxed_object_oid(&oid, m, i);
Martin Ågren1e6771e2020-12-31 12:56:20 +0100142 if (!match_hash(ds->len, ds->bin_pfx.hash, current->hash))
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400143 break;
144 update_candidates(ds, current);
145 }
146}
147
Jeff King00160432016-09-26 08:00:04 -0400148static void unique_in_pack(struct packed_git *p,
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700149 struct disambiguate_state *ds)
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700150{
René Scharfe902f5a22018-03-24 17:41:08 +0100151 uint32_t num, i, first = 0;
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700152
Derrick Stoleeaf96fe32019-04-29 09:18:56 -0700153 if (p->multi_pack_index)
154 return;
155
Derrick Stolee0e87b852017-10-12 08:02:20 -0400156 if (open_pack_index(p) || !p->num_objects)
157 return;
158
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700159 num = p->num_objects;
René Scharfe902f5a22018-03-24 17:41:08 +0100160 bsearch_pack(&ds->bin_pfx, p, &first);
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700161
162 /*
163 * At this point, "first" is the location of the lowest object
Junio C Hamano1703f9a2012-06-20 22:35:43 -0700164 * with an object name that could match "bin_pfx". See if we have
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700165 * 0, 1 or more objects that actually match(es).
166 */
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700167 for (i = first; i < num && !ds->ambiguous; i++) {
brian m. carlsond2b7d9c2017-03-26 16:01:34 +0000168 struct object_id oid;
Jeff King07636712020-02-23 23:27:36 -0500169 nth_packed_object_id(&oid, p, i);
Martin Ågren1e6771e2020-12-31 12:56:20 +0100170 if (!match_hash(ds->len, ds->bin_pfx.hash, oid.hash))
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700171 break;
Jeff King07636712020-02-23 23:27:36 -0500172 update_candidates(ds, &oid);
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700173 }
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700174}
175
Jeff King00160432016-09-26 08:00:04 -0400176static void find_short_packed_object(struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700177{
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400178 struct multi_pack_index *m;
Junio C Hamano9938af62005-08-03 22:15:49 -0700179 struct packed_git *p;
180
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700181 for (m = get_multi_pack_index(ds->repo); m && !ds->ambiguous;
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400182 m = m->next)
183 unique_in_midx(m, ds);
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700184 for (p = get_packed_git(ds->repo); p && !ds->ambiguous;
Stefan Bellera80d72d2018-03-23 18:20:59 +0100185 p = p->next)
Jeff King00160432016-09-26 08:00:04 -0400186 unique_in_pack(p, ds);
Junio C Hamano99a19b42005-10-02 21:40:51 -0700187}
188
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700189static int finish_object_disambiguation(struct disambiguate_state *ds,
brian m. carlsone82caf32017-07-13 23:49:28 +0000190 struct object_id *oid)
Junio C Hamano99a19b42005-10-02 21:40:51 -0700191{
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700192 if (ds->ambiguous)
193 return SHORT_NAME_AMBIGUOUS;
Junio C Hamano99a19b42005-10-02 21:40:51 -0700194
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700195 if (!ds->candidate_exists)
David Turnerd1dd94b2019-01-17 23:19:43 -0500196 return MISSING_OBJECT;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700197
198 if (!ds->candidate_checked)
199 /*
200 * If this is the only candidate, there is no point
201 * calling the disambiguation hint callback.
202 *
203 * On the other hand, if the current candidate
204 * replaced an earlier candidate that did _not_ pass
205 * the disambiguation hint callback, then we do have
206 * more than one objects that match the short name
207 * given, so we should make sure this one matches;
208 * otherwise, if we discovered this one and the one
209 * that we previously discarded in the reverse order,
210 * we would end up showing different results in the
211 * same repository!
212 */
213 ds->candidate_ok = (!ds->disambiguate_fn_used ||
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700214 ds->fn(ds->repo, &ds->candidate, ds->cb_data));
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700215
216 if (!ds->candidate_ok)
Junio C Hamano013f2762005-10-11 15:22:48 -0700217 return SHORT_NAME_AMBIGUOUS;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700218
brian m. carlsone82caf32017-07-13 23:49:28 +0000219 oidcpy(oid, &ds->candidate);
Junio C Hamano9938af62005-08-03 22:15:49 -0700220 return 0;
221}
222
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700223static int disambiguate_commit_only(struct repository *r,
224 const struct object_id *oid,
225 void *cb_data_unused)
Junio C Hamano9938af62005-08-03 22:15:49 -0700226{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700227 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700228 return kind == OBJ_COMMIT;
229}
Junio C Hamano9938af62005-08-03 22:15:49 -0700230
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700231static int disambiguate_committish_only(struct repository *r,
232 const struct object_id *oid,
233 void *cb_data_unused)
Junio C Hamanoe2643612012-07-02 10:00:40 -0700234{
235 struct object *obj;
236 int kind;
237
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700238 kind = oid_object_info(r, oid, NULL);
Junio C Hamanoe2643612012-07-02 10:00:40 -0700239 if (kind == OBJ_COMMIT)
240 return 1;
241 if (kind != OBJ_TAG)
242 return 0;
243
244 /* We need to do this the hard way... */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700245 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
Junio C Hamanoe2643612012-07-02 10:00:40 -0700246 if (obj && obj->type == OBJ_COMMIT)
247 return 1;
248 return 0;
249}
250
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700251static int disambiguate_tree_only(struct repository *r,
252 const struct object_id *oid,
253 void *cb_data_unused)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700254{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700255 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700256 return kind == OBJ_TREE;
257}
258
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700259static int disambiguate_treeish_only(struct repository *r,
260 const struct object_id *oid,
261 void *cb_data_unused)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700262{
263 struct object *obj;
264 int kind;
265
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700266 kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700267 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
268 return 1;
269 if (kind != OBJ_TAG)
270 return 0;
271
272 /* We need to do this the hard way... */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700273 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700274 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
275 return 1;
276 return 0;
277}
278
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700279static int disambiguate_blob_only(struct repository *r,
280 const struct object_id *oid,
281 void *cb_data_unused)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700282{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700283 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700284 return kind == OBJ_BLOB;
285}
286
Jeff King5b33cb12016-09-27 08:38:01 -0400287static disambiguate_hint_fn default_disambiguate_hint;
288
289int set_disambiguate_hint_config(const char *var, const char *value)
290{
291 static const struct {
292 const char *name;
293 disambiguate_hint_fn fn;
294 } hints[] = {
295 { "none", NULL },
296 { "commit", disambiguate_commit_only },
297 { "committish", disambiguate_committish_only },
298 { "tree", disambiguate_tree_only },
299 { "treeish", disambiguate_treeish_only },
300 { "blob", disambiguate_blob_only }
301 };
302 int i;
303
304 if (!value)
305 return config_error_nonbool(var);
306
307 for (i = 0; i < ARRAY_SIZE(hints); i++) {
308 if (!strcasecmp(value, hints[i].name)) {
309 default_disambiguate_hint = hints[i].fn;
310 return 0;
311 }
312 }
313
314 return error("unknown hint type for '%s': %s", var, value);
315}
316
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700317static int init_object_disambiguation(struct repository *r,
318 const char *name, int len,
Jeff King00160432016-09-26 08:00:04 -0400319 struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700320{
Junio C Hamano957d7402012-07-03 14:21:59 -0700321 int i;
Junio C Hamano9938af62005-08-03 22:15:49 -0700322
brian m. carlson7b38efa2018-07-16 01:27:58 +0000323 if (len < MINIMUM_ABBREV || len > the_hash_algo->hexsz)
Jeff King00160432016-09-26 08:00:04 -0400324 return -1;
325
326 memset(ds, 0, sizeof(*ds));
Jeff King00160432016-09-26 08:00:04 -0400327
Linus Torvaldsaf61c6e2005-09-19 15:16:03 -0700328 for (i = 0; i < len ;i++) {
Junio C Hamano9938af62005-08-03 22:15:49 -0700329 unsigned char c = name[i];
330 unsigned char val;
Junio C Hamano9938af62005-08-03 22:15:49 -0700331 if (c >= '0' && c <= '9')
332 val = c - '0';
333 else if (c >= 'a' && c <= 'f')
334 val = c - 'a' + 10;
335 else if (c >= 'A' && c <='F') {
336 val = c - 'A' + 10;
337 c -= 'A' - 'a';
338 }
339 else
340 return -1;
Jeff King00160432016-09-26 08:00:04 -0400341 ds->hex_pfx[i] = c;
Junio C Hamano9938af62005-08-03 22:15:49 -0700342 if (!(i & 1))
343 val <<= 4;
brian m. carlsond2ee1182017-03-26 16:01:33 +0000344 ds->bin_pfx.hash[i >> 1] |= val;
Junio C Hamano9938af62005-08-03 22:15:49 -0700345 }
Jeff King00160432016-09-26 08:00:04 -0400346
347 ds->len = len;
Jeff King59e4e342016-09-26 08:00:07 -0400348 ds->hex_pfx[len] = '\0';
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700349 ds->repo = r;
350 prepare_alt_odb(r);
Junio C Hamano957d7402012-07-03 14:21:59 -0700351 return 0;
352}
Junio C Hamano99a19b42005-10-02 21:40:51 -0700353
brian m. carlson1b7ba792017-03-31 01:39:59 +0000354static int show_ambiguous_object(const struct object_id *oid, void *data)
Jeff King1ffa26c2016-09-26 08:00:36 -0400355{
356 const struct disambiguate_state *ds = data;
357 struct strbuf desc = STRBUF_INIT;
358 int type;
359
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700360 if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data))
Jeff King1ffa26c2016-09-26 08:00:36 -0400361 return 0;
362
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700363 type = oid_object_info(ds->repo, oid, NULL);
Jeff King1ffa26c2016-09-26 08:00:36 -0400364 if (type == OBJ_COMMIT) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700365 struct commit *commit = lookup_commit(ds->repo, oid);
Jeff King1ffa26c2016-09-26 08:00:36 -0400366 if (commit) {
367 struct pretty_print_context pp = {0};
368 pp.date_mode.type = DATE_SHORT;
369 format_commit_message(commit, " %ad - %s", &desc, &pp);
370 }
371 } else if (type == OBJ_TAG) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700372 struct tag *tag = lookup_tag(ds->repo, oid);
Jeff King1ffa26c2016-09-26 08:00:36 -0400373 if (!parse_tag(tag) && tag->tag)
374 strbuf_addf(&desc, " %s", tag->tag);
375 }
376
377 advise(" %s %s%s",
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700378 repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV),
Brandon Williamsdebca9d2018-02-14 10:59:24 -0800379 type_name(type) ? type_name(type) : "unknown type",
Jeff King1ffa26c2016-09-26 08:00:36 -0400380 desc.buf);
381
382 strbuf_release(&desc);
383 return 0;
384}
385
Ævar Arnfjörð Bjarmasona885c932018-05-10 12:43:01 +0000386static int collect_ambiguous(const struct object_id *oid, void *data)
387{
388 oid_array_append(data, oid);
389 return 0;
390}
391
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700392static int repo_collect_ambiguous(struct repository *r,
393 const struct object_id *oid,
394 void *data)
395{
396 return collect_ambiguous(oid, data);
397}
398
René Scharfe7cfcb162019-08-20 20:49:12 +0200399static int sort_ambiguous(const void *a, const void *b, void *ctx)
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000400{
René Scharfe7cfcb162019-08-20 20:49:12 +0200401 struct repository *sort_ambiguous_repo = ctx;
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700402 int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
403 int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000404 int a_type_sort;
405 int b_type_sort;
406
407 /*
408 * Sorts by hash within the same object type, just as
409 * oid_array_for_each_unique() would do.
410 */
411 if (a_type == b_type)
412 return oidcmp(a, b);
413
414 /*
415 * Between object types show tags, then commits, and finally
416 * trees and blobs.
417 *
418 * The object_type enum is commit, tree, blob, tag, but we
419 * want tag, commit, tree blob. Cleverly (perhaps too
420 * cleverly) do that with modulus, since the enum assigns 1 to
421 * commit, so tag becomes 0.
422 */
423 a_type_sort = a_type % 4;
424 b_type_sort = b_type % 4;
425 return a_type_sort > b_type_sort ? 1 : -1;
426}
427
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700428static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
429{
René Scharfe7cfcb162019-08-20 20:49:12 +0200430 QSORT_S(a->oid, a->nr, sort_ambiguous, r);
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700431}
432
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700433static enum get_oid_result get_short_oid(struct repository *r,
434 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -0500435 struct object_id *oid,
436 unsigned flags)
Junio C Hamano957d7402012-07-03 14:21:59 -0700437{
438 int status;
Junio C Hamano957d7402012-07-03 14:21:59 -0700439 struct disambiguate_state ds;
brian m. carlson321c89b2017-07-13 23:49:29 +0000440 int quietly = !!(flags & GET_OID_QUIETLY);
Junio C Hamano957d7402012-07-03 14:21:59 -0700441
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700442 if (init_object_disambiguation(r, name, len, &ds) < 0)
Junio C Hamano957d7402012-07-03 14:21:59 -0700443 return -1;
Jeff King259942f2016-09-26 07:59:01 -0400444
brian m. carlson321c89b2017-07-13 23:49:29 +0000445 if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
Johannes Schindelin033abf92018-05-02 11:38:39 +0200446 BUG("multiple get_short_oid disambiguator flags");
Jeff King259942f2016-09-26 07:59:01 -0400447
brian m. carlson321c89b2017-07-13 23:49:29 +0000448 if (flags & GET_OID_COMMIT)
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700449 ds.fn = disambiguate_commit_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000450 else if (flags & GET_OID_COMMITTISH)
Junio C Hamanoe2643612012-07-02 10:00:40 -0700451 ds.fn = disambiguate_committish_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000452 else if (flags & GET_OID_TREE)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700453 ds.fn = disambiguate_tree_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000454 else if (flags & GET_OID_TREEISH)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700455 ds.fn = disambiguate_treeish_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000456 else if (flags & GET_OID_BLOB)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700457 ds.fn = disambiguate_blob_only;
Jeff King5b33cb12016-09-27 08:38:01 -0400458 else
459 ds.fn = default_disambiguate_hint;
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700460
Jeff King00160432016-09-26 08:00:04 -0400461 find_short_object_filename(&ds);
462 find_short_packed_object(&ds);
brian m. carlsone82caf32017-07-13 23:49:28 +0000463 status = finish_object_disambiguation(&ds, oid);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700464
Johannes Schindelin6d67a992019-03-13 03:16:34 -0700465 /*
466 * If we didn't find it, do the usual reprepare() slow-path,
467 * since the object may have recently been added to the repository
468 * or migrated from loose to packed.
469 */
470 if (status == MISSING_OBJECT) {
Nguyễn Thái Ngọc Duy34e77712019-06-27 16:28:52 +0700471 reprepare_packed_git(r);
Johannes Schindelin6d67a992019-03-13 03:16:34 -0700472 find_short_object_filename(&ds);
473 find_short_packed_object(&ds);
474 status = finish_object_disambiguation(&ds, oid);
475 }
476
Jeff King1ffa26c2016-09-26 08:00:36 -0400477 if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000478 struct oid_array collect = OID_ARRAY_INIT;
479
Martin Ågren1e6771e2020-12-31 12:56:20 +0100480 error(_("short object ID %s is ambiguous"), ds.hex_pfx);
Jeff King1ffa26c2016-09-26 08:00:36 -0400481
482 /*
483 * We may still have ambiguity if we simply saw a series of
484 * candidates that did not satisfy our hint function. In
485 * that case, we still want to show them, so disable the hint
486 * function entirely.
487 */
488 if (!ds.ambiguous)
489 ds.fn = NULL;
490
491 advise(_("The candidates are:"));
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700492 repo_for_each_abbrev(r, ds.hex_pfx, collect_ambiguous, &collect);
493 sort_ambiguous_oid_array(r, &collect);
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000494
495 if (oid_array_for_each(&collect, show_ambiguous_object, &ds))
496 BUG("show_ambiguous_object shouldn't return non-zero");
497 oid_array_clear(&collect);
Jeff King1ffa26c2016-09-26 08:00:36 -0400498 }
499
Junio C Hamano013f2762005-10-11 15:22:48 -0700500 return status;
501}
502
Nguyễn Thái Ngọc Duy4e99f2d2019-04-16 16:33:24 +0700503int repo_for_each_abbrev(struct repository *r, const char *prefix,
504 each_abbrev_fn fn, void *cb_data)
Junio C Hamano957d7402012-07-03 14:21:59 -0700505{
brian m. carlson910650d2017-03-31 01:40:00 +0000506 struct oid_array collect = OID_ARRAY_INIT;
Junio C Hamano957d7402012-07-03 14:21:59 -0700507 struct disambiguate_state ds;
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400508 int ret;
Junio C Hamano957d7402012-07-03 14:21:59 -0700509
Nguyễn Thái Ngọc Duy4e99f2d2019-04-16 16:33:24 +0700510 if (init_object_disambiguation(r, prefix, strlen(prefix), &ds) < 0)
Junio C Hamano957d7402012-07-03 14:21:59 -0700511 return -1;
512
Junio C Hamano957d7402012-07-03 14:21:59 -0700513 ds.always_call_fn = 1;
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700514 ds.fn = repo_collect_ambiguous;
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400515 ds.cb_data = &collect;
Jeff King00160432016-09-26 08:00:04 -0400516 find_short_object_filename(&ds);
517 find_short_packed_object(&ds);
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400518
brian m. carlson910650d2017-03-31 01:40:00 +0000519 ret = oid_array_for_each_unique(&collect, fn, cb_data);
520 oid_array_clear(&collect);
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400521 return ret;
Junio C Hamano957d7402012-07-03 14:21:59 -0700522}
523
Jeff King8e3f52d2016-10-03 19:47:28 -0400524/*
525 * Return the slot of the most-significant bit set in "val". There are various
526 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
527 * probably not a big deal here.
528 */
529static unsigned msb(unsigned long val)
530{
531 unsigned r = 0;
532 while (val >>= 1)
533 r++;
534 return r;
535}
536
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400537struct min_abbrev_data {
538 unsigned int init_len;
539 unsigned int cur_len;
540 char *hex;
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700541 struct repository *repo;
brian m. carlson626fd982018-03-22 13:40:08 -0400542 const struct object_id *oid;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400543};
544
Derrick Stoleea42d6fd2017-10-12 08:02:19 -0400545static inline char get_hex_char_from_oid(const struct object_id *oid,
546 unsigned int pos)
547{
548 static const char hex[] = "0123456789abcdef";
549
550 if ((pos & 1) == 0)
551 return hex[oid->hash[pos >> 1] >> 4];
552 else
553 return hex[oid->hash[pos >> 1] & 0xf];
554}
555
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400556static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
557{
558 struct min_abbrev_data *mad = cb_data;
559
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400560 unsigned int i = mad->init_len;
Derrick Stoleea42d6fd2017-10-12 08:02:19 -0400561 while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400562 i++;
563
564 if (i < GIT_MAX_RAWSZ && i >= mad->cur_len)
565 mad->cur_len = i + 1;
566
567 return 0;
568}
569
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700570static int repo_extend_abbrev_len(struct repository *r,
571 const struct object_id *oid,
572 void *cb_data)
573{
574 return extend_abbrev_len(oid, cb_data);
575}
576
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400577static void find_abbrev_len_for_midx(struct multi_pack_index *m,
578 struct min_abbrev_data *mad)
579{
580 int match = 0;
581 uint32_t num, first = 0;
582 struct object_id oid;
583 const struct object_id *mad_oid;
584
585 if (!m->num_objects)
586 return;
587
588 num = m->num_objects;
589 mad_oid = mad->oid;
590 match = bsearch_midx(mad_oid, m, &first);
591
592 /*
593 * first is now the position in the packfile where we would insert
594 * mad->hash if it does not exist (or the position of mad->hash if
595 * it does exist). Hence, we consider a maximum of two objects
596 * nearby for the abbreviation length.
597 */
598 mad->init_len = 0;
599 if (!match) {
600 if (nth_midxed_object_oid(&oid, m, first))
601 extend_abbrev_len(&oid, mad);
602 } else if (first < num - 1) {
603 if (nth_midxed_object_oid(&oid, m, first + 1))
604 extend_abbrev_len(&oid, mad);
605 }
606 if (first > 0) {
607 if (nth_midxed_object_oid(&oid, m, first - 1))
608 extend_abbrev_len(&oid, mad);
609 }
610 mad->init_len = mad->cur_len;
611}
612
Derrick Stolee0e87b852017-10-12 08:02:20 -0400613static void find_abbrev_len_for_pack(struct packed_git *p,
614 struct min_abbrev_data *mad)
615{
616 int match = 0;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400617 uint32_t num, first = 0;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400618 struct object_id oid;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400619 const struct object_id *mad_oid;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400620
Derrick Stoleeaf96fe32019-04-29 09:18:56 -0700621 if (p->multi_pack_index)
622 return;
623
Derrick Stolee0e87b852017-10-12 08:02:20 -0400624 if (open_pack_index(p) || !p->num_objects)
625 return;
626
627 num = p->num_objects;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400628 mad_oid = mad->oid;
629 match = bsearch_pack(mad_oid, p, &first);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400630
631 /*
632 * first is now the position in the packfile where we would insert
633 * mad->hash if it does not exist (or the position of mad->hash if
Derrick Stolee21abed52018-02-27 06:47:04 -0500634 * it does exist). Hence, we consider a maximum of two objects
Derrick Stolee0e87b852017-10-12 08:02:20 -0400635 * nearby for the abbreviation length.
636 */
637 mad->init_len = 0;
638 if (!match) {
Jeff King07636712020-02-23 23:27:36 -0500639 if (!nth_packed_object_id(&oid, p, first))
Derrick Stolee21abed52018-02-27 06:47:04 -0500640 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400641 } else if (first < num - 1) {
Jeff King07636712020-02-23 23:27:36 -0500642 if (!nth_packed_object_id(&oid, p, first + 1))
Derrick Stolee21abed52018-02-27 06:47:04 -0500643 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400644 }
645 if (first > 0) {
Jeff King07636712020-02-23 23:27:36 -0500646 if (!nth_packed_object_id(&oid, p, first - 1))
Derrick Stolee21abed52018-02-27 06:47:04 -0500647 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400648 }
649 mad->init_len = mad->cur_len;
650}
651
652static void find_abbrev_len_packed(struct min_abbrev_data *mad)
653{
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400654 struct multi_pack_index *m;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400655 struct packed_git *p;
656
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700657 for (m = get_multi_pack_index(mad->repo); m; m = m->next)
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400658 find_abbrev_len_for_midx(m, mad);
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700659 for (p = get_packed_git(mad->repo); p; p = p->next)
Derrick Stolee0e87b852017-10-12 08:02:20 -0400660 find_abbrev_len_for_pack(p, mad);
661}
662
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700663int repo_find_unique_abbrev_r(struct repository *r, char *hex,
664 const struct object_id *oid, int len)
Junio C Hamano013f2762005-10-11 15:22:48 -0700665{
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400666 struct disambiguate_state ds;
667 struct min_abbrev_data mad;
668 struct object_id oid_ret;
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700669 const unsigned hexsz = r->hash_algo->hexsz;
brian m. carlson7b38efa2018-07-16 01:27:58 +0000670
Linus Torvaldse6c587c2016-09-30 17:19:37 -0700671 if (len < 0) {
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700672 unsigned long count = repo_approximate_object_count(r);
Jeff King8e3f52d2016-10-03 19:47:28 -0400673 /*
674 * Add one because the MSB only tells us the highest bit set,
675 * not including the value of all the _other_ bits (so "15"
676 * is only one off of 2^4, but the MSB is the 3rd bit.
677 */
678 len = msb(count) + 1;
679 /*
680 * We now know we have on the order of 2^len objects, which
681 * expects a collision at 2^(len/2). But we also care about hex
682 * chars, not bits, and there are 4 bits per hex. So all
René Scharfe42c78a22017-07-08 12:35:35 +0200683 * together we need to divide by 2 and round up.
Jeff King8e3f52d2016-10-03 19:47:28 -0400684 */
René Scharfe42c78a22017-07-08 12:35:35 +0200685 len = DIV_ROUND_UP(len, 2);
Jeff King8e3f52d2016-10-03 19:47:28 -0400686 /*
687 * For very small repos, we stick with our regular fallback.
688 */
689 if (len < FALLBACK_DEFAULT_ABBREV)
690 len = FALLBACK_DEFAULT_ABBREV;
Linus Torvaldse6c587c2016-09-30 17:19:37 -0700691 }
Jeff King8e3f52d2016-10-03 19:47:28 -0400692
brian m. carlsonaab95832018-03-12 02:27:30 +0000693 oid_to_hex_r(hex, oid);
brian m. carlson7b38efa2018-07-16 01:27:58 +0000694 if (len == hexsz || !len)
695 return hexsz;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400696
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700697 mad.repo = r;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400698 mad.init_len = len;
699 mad.cur_len = len;
700 mad.hex = hex;
brian m. carlson626fd982018-03-22 13:40:08 -0400701 mad.oid = oid;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400702
703 find_abbrev_len_packed(&mad);
704
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700705 if (init_object_disambiguation(r, hex, mad.cur_len, &ds) < 0)
Derrick Stolee0e87b852017-10-12 08:02:20 -0400706 return -1;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400707
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700708 ds.fn = repo_extend_abbrev_len;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400709 ds.always_call_fn = 1;
710 ds.cb_data = (void *)&mad;
711
712 find_short_object_filename(&ds);
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400713 (void)finish_object_disambiguation(&ds, &oid_ret);
714
715 hex[mad.cur_len] = 0;
716 return mad.cur_len;
Jeff Kingaf49c6d2015-09-24 17:05:45 -0400717}
718
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700719const char *repo_find_unique_abbrev(struct repository *r,
720 const struct object_id *oid,
721 int len)
Jeff Kingaf49c6d2015-09-24 17:05:45 -0400722{
Jeff Kingef2ed502016-10-20 02:19:19 -0400723 static int bufno;
brian m. carlsondc015052017-03-26 16:01:24 +0000724 static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
René Scharfe3e989192016-11-01 09:49:07 +0100725 char *hex = hexbuffer[bufno];
726 bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700727 repo_find_unique_abbrev_r(r, hex, oid, len);
Junio C Hamanob66fde92008-03-01 23:35:32 -0800728 return hex;
Junio C Hamano9938af62005-08-03 22:15:49 -0700729}
730
Junio C Hamano6677c462005-12-15 12:54:00 -0800731static int ambiguous_path(const char *path, int len)
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700732{
733 int slash = 1;
Junio C Hamano6677c462005-12-15 12:54:00 -0800734 int cnt;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700735
Junio C Hamano6677c462005-12-15 12:54:00 -0800736 for (cnt = 0; cnt < len; cnt++) {
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700737 switch (*path++) {
738 case '\0':
739 break;
740 case '/':
741 if (slash)
742 break;
743 slash = 1;
744 continue;
745 case '.':
746 continue;
747 default:
748 slash = 0;
749 continue;
750 }
Junio C Hamanoc054d642005-12-17 00:00:50 -0800751 break;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700752 }
Junio C Hamano6677c462005-12-15 12:54:00 -0800753 return slash;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700754}
755
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400756static inline int at_mark(const char *string, int len,
757 const char **suffix, int nr)
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800758{
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800759 int i;
760
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400761 for (i = 0; i < nr; i++) {
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800762 int suffix_len = strlen(suffix[i]);
763 if (suffix_len <= len
Ævar Arnfjörð Bjarmason244ea1b2017-03-27 11:16:55 +0000764 && !strncasecmp(string, suffix[i], suffix_len))
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800765 return suffix_len;
766 }
767 return 0;
768}
769
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400770static inline int upstream_mark(const char *string, int len)
771{
772 const char *suffix[] = { "@{upstream}", "@{u}" };
773 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
774}
775
Jeff Kingadfe5d02015-05-21 00:45:47 -0400776static inline int push_mark(const char *string, int len)
777{
778 const char *suffix[] = { "@{push}" };
779 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
780}
781
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700782static enum get_oid_result get_oid_1(struct repository *r, const char *name, int len, struct object_id *oid, unsigned lookup_flags);
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +0700783static int interpret_nth_prior_checkout(struct repository *r, const char *name, int namelen, struct strbuf *buf);
Thomas Rastd18ba222009-01-17 17:09:55 +0100784
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700785static int get_oid_basic(struct repository *r, const char *str, int len,
786 struct object_id *oid, unsigned int flags)
Junio C Hamanoe86eb662007-01-19 01:15:15 -0800787{
Jon Seymoureedce782010-08-24 14:52:43 +1000788 static const char *warn_msg = "refname '%.*s' is ambiguous.";
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700789 static const char *object_name_msg = N_(
790 "Git normally never creates a ref that ends with 40 hex characters\n"
791 "because it will be ignored when you just specify 40-hex. These refs\n"
792 "may be created by mistake. For example,\n"
793 "\n"
Nguyễn Thái Ngọc Duy328c6cb2019-03-29 17:39:19 +0700794 " git switch -c $br $(git rev-parse ...)\n"
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700795 "\n"
796 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
797 "examine these refs and maybe delete them. Turn this message off by\n"
Thomas Rast8dc84fd2013-07-31 22:23:31 +0200798 "running \"git config advice.objectNameWarning false\"");
brian m. carlsone82caf32017-07-13 23:49:28 +0000799 struct object_id tmp_oid;
Linus Torvaldsed378ec2006-09-11 20:17:35 -0700800 char *real_ref = NULL;
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700801 int refs_found = 0;
Felipe Contreras128fd542013-05-07 16:55:10 -0500802 int at, reflog_len, nth_prior = 0;
Junio C Hamano9938af62005-08-03 22:15:49 -0700803
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700804 if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {
Brodie Rao832cf742014-01-06 19:32:01 -0800805 if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
Jonathan Tanf24c30e2020-09-01 15:28:09 -0700806 refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0);
Brodie Rao832cf742014-01-06 19:32:01 -0800807 if (refs_found > 0) {
Jeff King25fba782013-07-12 02:20:05 -0400808 warning(warn_msg, len, str);
Ben Boeckeled9bff02021-08-23 12:44:00 +0200809 if (advice_enabled(ADVICE_OBJECT_NAME_WARNING))
Jeff King25fba782013-07-12 02:20:05 -0400810 fprintf(stderr, "%s\n", _(object_name_msg));
811 }
812 free(real_ref);
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700813 }
Junio C Hamano9938af62005-08-03 22:15:49 -0700814 return 0;
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700815 }
Junio C Hamano9938af62005-08-03 22:15:49 -0700816
Thomas Rastd18ba222009-01-17 17:09:55 +0100817 /* basic@{time or number or -number} format to query ref-log */
Junio C Hamano694500e2006-10-23 21:15:34 -0700818 reflog_len = at = 0;
Johannes Schindelinf2654582009-01-28 00:07:46 +0100819 if (len && str[len-1] == '}') {
Ramkumar Ramachandrae883a052013-05-07 16:55:09 -0500820 for (at = len-4; at >= 0; at--) {
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700821 if (str[at] == '@' && str[at+1] == '{') {
Ramkumar Ramachandra83d16bc2013-05-07 16:55:11 -0500822 if (str[at+2] == '-') {
823 if (at != 0)
824 /* @{-N} not at start */
825 return -1;
Felipe Contreras128fd542013-05-07 16:55:10 -0500826 nth_prior = 1;
827 continue;
828 }
Jeff Kingadfe5d02015-05-21 00:45:47 -0400829 if (!upstream_mark(str + at, len - at) &&
830 !push_mark(str + at, len - at)) {
Johannes Schindelin28fb8432009-09-10 17:25:57 +0200831 reflog_len = (len-1) - (at+2);
832 len = at;
833 }
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700834 break;
835 }
Shawn Pearced556fae2006-05-17 05:56:09 -0400836 }
837 }
838
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700839 /* Accept only unambiguous ref paths. */
Nicolas Pitre11cf8802007-02-01 17:29:33 -0500840 if (len && ambiguous_path(str, len))
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700841 return -1;
842
Felipe Contreras128fd542013-05-07 16:55:10 -0500843 if (nth_prior) {
Thomas Rastd18ba222009-01-17 17:09:55 +0100844 struct strbuf buf = STRBUF_INIT;
Felipe Contreras128fd542013-05-07 16:55:10 -0500845 int detached;
846
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700847 if (interpret_nth_prior_checkout(r, str, len, &buf) > 0) {
848 detached = (buf.len == r->hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
Felipe Contreras128fd542013-05-07 16:55:10 -0500849 strbuf_release(&buf);
850 if (detached)
851 return 0;
Thomas Rastd18ba222009-01-17 17:09:55 +0100852 }
Felipe Contreras128fd542013-05-07 16:55:10 -0500853 }
854
855 if (!len && reflog_len)
Nicolas Pitre11cf8802007-02-01 17:29:33 -0500856 /* allow "@{...}" to mean the current branch reflog */
Jonathan Tanf24c30e2020-09-01 15:28:09 -0700857 refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref, 0);
Felipe Contreras128fd542013-05-07 16:55:10 -0500858 else if (reflog_len)
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700859 refs_found = repo_dwim_log(r, str, len, oid, &real_ref);
Nicolas Pitref2eba662007-02-03 21:49:16 -0500860 else
Jonathan Tanf24c30e2020-09-01 15:28:09 -0700861 refs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0);
Shawn Pearced556fae2006-05-17 05:56:09 -0400862
863 if (!refs_found)
864 return -1;
865
brian m. carlson321c89b2017-07-13 23:49:29 +0000866 if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700867 (refs_found > 1 ||
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700868 !get_short_oid(r, str, len, &tmp_oid, GET_OID_QUIETLY)))
Jon Seymoureedce782010-08-24 14:52:43 +1000869 warning(warn_msg, len, str);
Shawn Pearced556fae2006-05-17 05:56:09 -0400870
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700871 if (reflog_len) {
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700872 int nth, i;
Johannes Schindelindddbad72017-04-26 21:29:31 +0200873 timestamp_t at_time;
874 timestamp_t co_time;
Junio C Hamano16d7cc92007-01-19 01:19:05 -0800875 int co_tz, co_cnt;
876
Nicolas Pitrefe558512007-02-01 12:33:23 -0500877 /* Is it asking for N-th entry, or approxidate? */
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700878 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
879 char ch = str[at+2+i];
880 if ('0' <= ch && ch <= '9')
881 nth = nth * 10 + ch - '0';
882 else
883 nth = -1;
884 }
Shawn O. Pearceea360dd2008-08-21 08:40:44 -0700885 if (100000000 <= nth) {
886 at_time = nth;
887 nth = -1;
888 } else if (0 <= nth)
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700889 at_time = 0;
Jeff King861f00e2008-04-30 00:13:58 -0400890 else {
Junio C Hamano93cfa7c2010-01-26 11:58:00 -0800891 int errors = 0;
Jeff King861f00e2008-04-30 00:13:58 -0400892 char *tmp = xstrndup(str + at + 2, reflog_len);
Junio C Hamano93cfa7c2010-01-26 11:58:00 -0800893 at_time = approxidate_careful(tmp, &errors);
Jeff King861f00e2008-04-30 00:13:58 -0400894 free(tmp);
Jeff King28b35632014-07-24 00:41:11 -0400895 if (errors) {
896 free(real_ref);
Junio C Hamanoa5e10ac2010-01-27 10:53:09 -0800897 return -1;
Jeff King28b35632014-07-24 00:41:11 -0400898 }
Jeff King861f00e2008-04-30 00:13:58 -0400899 }
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700900 if (read_ref_at(get_main_ref_store(r),
Nguyễn Thái Ngọc Duy7fdff472019-04-06 18:34:30 +0700901 real_ref, flags, at_time, nth, oid, NULL,
Junio C Hamano16d7cc92007-01-19 01:19:05 -0800902 &co_time, &co_tz, &co_cnt)) {
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +0530903 if (!len) {
Junio C Hamano145136a2020-01-30 11:35:46 -0800904 if (!skip_prefix(real_ref, "refs/heads/", &str))
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +0530905 str = "HEAD";
Junio C Hamano145136a2020-01-30 11:35:46 -0800906 len = strlen(str);
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +0530907 }
David Aguilarc41a87d2014-09-18 20:45:37 -0700908 if (at_time) {
brian m. carlson321c89b2017-07-13 23:49:29 +0000909 if (!(flags & GET_OID_QUIETLY)) {
Jeff Kingb0418302020-01-24 19:13:01 -0500910 warning(_("log for '%.*s' only goes back to %s"),
911 len, str,
Jeff Kinga5481a62015-06-25 12:55:02 -0400912 show_date(co_time, co_tz, DATE_MODE(RFC2822)));
David Aguilarc41a87d2014-09-18 20:45:37 -0700913 }
914 } else {
brian m. carlson321c89b2017-07-13 23:49:29 +0000915 if (flags & GET_OID_QUIETLY) {
David Aguilarc41a87d2014-09-18 20:45:37 -0700916 exit(128);
917 }
Jeff Kingb0418302020-01-24 19:13:01 -0500918 die(_("log for '%.*s' only has %d entries"),
Jon Seymoure6eedc32010-08-24 14:52:42 +1000919 len, str, co_cnt);
920 }
Junio C Hamano16d7cc92007-01-19 01:19:05 -0800921 }
Shawn Pearced556fae2006-05-17 05:56:09 -0400922 }
923
Linus Torvaldsed378ec2006-09-11 20:17:35 -0700924 free(real_ref);
Shawn Pearced556fae2006-05-17 05:56:09 -0400925 return 0;
Junio C Hamano9938af62005-08-03 22:15:49 -0700926}
927
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700928static enum get_oid_result get_parent(struct repository *r,
929 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -0500930 struct object_id *result, int idx)
Junio C Hamano9938af62005-08-03 22:15:49 -0700931{
brian m. carlson1e43ed92017-05-06 22:10:09 +0000932 struct object_id oid;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700933 enum get_oid_result ret = get_oid_1(r, name, len, &oid,
David Turnerd1dd94b2019-01-17 23:19:43 -0500934 GET_OID_COMMITTISH);
Junio C Hamano9938af62005-08-03 22:15:49 -0700935 struct commit *commit;
936 struct commit_list *p;
937
938 if (ret)
939 return ret;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700940 commit = lookup_commit_reference(r, &oid);
Junio C Hamano9938af62005-08-03 22:15:49 -0700941 if (parse_commit(commit))
David Turnerd1dd94b2019-01-17 23:19:43 -0500942 return MISSING_OBJECT;
Junio C Hamano9938af62005-08-03 22:15:49 -0700943 if (!idx) {
brian m. carlsone82caf32017-07-13 23:49:28 +0000944 oidcpy(result, &commit->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -0500945 return FOUND;
Junio C Hamano9938af62005-08-03 22:15:49 -0700946 }
947 p = commit->parents;
948 while (p) {
949 if (!--idx) {
brian m. carlsone82caf32017-07-13 23:49:28 +0000950 oidcpy(result, &p->item->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -0500951 return FOUND;
Junio C Hamano9938af62005-08-03 22:15:49 -0700952 }
953 p = p->next;
954 }
David Turnerd1dd94b2019-01-17 23:19:43 -0500955 return MISSING_OBJECT;
Junio C Hamano9938af62005-08-03 22:15:49 -0700956}
957
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700958static enum get_oid_result get_nth_ancestor(struct repository *r,
959 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -0500960 struct object_id *result,
961 int generation)
Junio C Hamano4f7599a2005-08-21 02:43:54 -0700962{
brian m. carlson1e43ed92017-05-06 22:10:09 +0000963 struct object_id oid;
Linus Torvalds621ff672008-03-14 11:49:40 -0700964 struct commit *commit;
965 int ret;
966
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700967 ret = get_oid_1(r, name, len, &oid, GET_OID_COMMITTISH);
Junio C Hamano4f7599a2005-08-21 02:43:54 -0700968 if (ret)
969 return ret;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700970 commit = lookup_commit_reference(r, &oid);
Linus Torvalds621ff672008-03-14 11:49:40 -0700971 if (!commit)
David Turnerd1dd94b2019-01-17 23:19:43 -0500972 return MISSING_OBJECT;
Junio C Hamano4f7599a2005-08-21 02:43:54 -0700973
974 while (generation--) {
Linus Torvalds621ff672008-03-14 11:49:40 -0700975 if (parse_commit(commit) || !commit->parents)
David Turnerd1dd94b2019-01-17 23:19:43 -0500976 return MISSING_OBJECT;
Linus Torvalds621ff672008-03-14 11:49:40 -0700977 commit = commit->parents->item;
Junio C Hamano4f7599a2005-08-21 02:43:54 -0700978 }
brian m. carlsone82caf32017-07-13 23:49:28 +0000979 oidcpy(result, &commit->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -0500980 return FOUND;
Junio C Hamano4f7599a2005-08-21 02:43:54 -0700981}
982
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700983struct object *repo_peel_to_type(struct repository *r, const char *name, int namelen,
984 struct object *o, enum object_type expected_type)
Junio C Hamano81776312007-12-24 00:51:01 -0800985{
986 if (name && !namelen)
987 namelen = strlen(name);
Junio C Hamano81776312007-12-24 00:51:01 -0800988 while (1) {
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700989 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
Junio C Hamano81776312007-12-24 00:51:01 -0800990 return NULL;
Junio C Hamanoa6a3f2c2013-03-31 15:24:12 -0700991 if (expected_type == OBJ_ANY || o->type == expected_type)
Junio C Hamano81776312007-12-24 00:51:01 -0800992 return o;
993 if (o->type == OBJ_TAG)
994 o = ((struct tag*) o)->tagged;
995 else if (o->type == OBJ_COMMIT)
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700996 o = &(repo_get_commit_tree(r, ((struct commit *)o))->object);
Junio C Hamano81776312007-12-24 00:51:01 -0800997 else {
998 if (name)
999 error("%.*s: expected %s type, but the object "
1000 "dereferences to %s type",
Brandon Williamsdebca9d2018-02-14 10:59:24 -08001001 namelen, name, type_name(expected_type),
1002 type_name(o->type));
Junio C Hamano81776312007-12-24 00:51:01 -08001003 return NULL;
1004 }
1005 }
1006}
1007
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001008static int peel_onion(struct repository *r, const char *name, int len,
1009 struct object_id *oid, unsigned lookup_flags)
Junio C Hamano5385f522005-10-13 18:57:40 -07001010{
brian m. carlsonde37d502017-05-06 22:10:29 +00001011 struct object_id outer;
Junio C Hamano5385f522005-10-13 18:57:40 -07001012 const char *sp;
Linus Torvalds885a86a2006-06-14 16:45:13 -07001013 unsigned int expected_type = 0;
Junio C Hamano5385f522005-10-13 18:57:40 -07001014 struct object *o;
1015
1016 /*
1017 * "ref^{type}" dereferences ref repeatedly until you cannot
1018 * dereference anymore, or you get an object of given type,
1019 * whichever comes first. "ref^{}" means just dereference
1020 * tags until you get a non-tag. "ref^0" is a shorthand for
1021 * "ref^{commit}". "commit^{tree}" could be used to find the
1022 * top-level tree of the given commit.
1023 */
1024 if (len < 4 || name[len-1] != '}')
1025 return -1;
1026
1027 for (sp = name + len - 1; name <= sp; sp--) {
1028 int ch = *sp;
1029 if (ch == '{' && name < sp && sp[-1] == '^')
1030 break;
1031 }
1032 if (sp <= name)
1033 return -1;
1034
1035 sp++; /* beginning of type name, or closing brace for empty */
Christian Couder59556542013-11-30 21:55:40 +01001036 if (starts_with(sp, "commit}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001037 expected_type = OBJ_COMMIT;
Christian Couder59556542013-11-30 21:55:40 +01001038 else if (starts_with(sp, "tag}"))
Richard Hansen75aa26d2013-09-03 15:50:16 -04001039 expected_type = OBJ_TAG;
Christian Couder59556542013-11-30 21:55:40 +01001040 else if (starts_with(sp, "tree}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001041 expected_type = OBJ_TREE;
Christian Couder59556542013-11-30 21:55:40 +01001042 else if (starts_with(sp, "blob}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001043 expected_type = OBJ_BLOB;
Christian Couder59556542013-11-30 21:55:40 +01001044 else if (starts_with(sp, "object}"))
Junio C Hamanoa6a3f2c2013-03-31 15:24:12 -07001045 expected_type = OBJ_ANY;
Junio C Hamano5385f522005-10-13 18:57:40 -07001046 else if (sp[0] == '}')
Linus Torvalds19746322006-07-11 20:45:31 -07001047 expected_type = OBJ_NONE;
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001048 else if (sp[0] == '/')
1049 expected_type = OBJ_COMMIT;
Junio C Hamano5385f522005-10-13 18:57:40 -07001050 else
1051 return -1;
1052
brian m. carlson321c89b2017-07-13 23:49:29 +00001053 lookup_flags &= ~GET_OID_DISAMBIGUATORS;
Junio C Hamanoe2643612012-07-02 10:00:40 -07001054 if (expected_type == OBJ_COMMIT)
brian m. carlson321c89b2017-07-13 23:49:29 +00001055 lookup_flags |= GET_OID_COMMITTISH;
Junio C Hamanoed1ca602013-03-31 15:19:52 -07001056 else if (expected_type == OBJ_TREE)
brian m. carlson321c89b2017-07-13 23:49:29 +00001057 lookup_flags |= GET_OID_TREEISH;
Junio C Hamanoe2643612012-07-02 10:00:40 -07001058
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001059 if (get_oid_1(r, name, sp - name - 2, &outer, lookup_flags))
Junio C Hamano5385f522005-10-13 18:57:40 -07001060 return -1;
1061
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001062 o = parse_object(r, &outer);
Junio C Hamano5385f522005-10-13 18:57:40 -07001063 if (!o)
1064 return -1;
Linus Torvalds885a86a2006-06-14 16:45:13 -07001065 if (!expected_type) {
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001066 o = deref_tag(r, o, name, sp - name - 2);
1067 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
Junio C Hamano6e1c6c12005-10-19 22:48:16 -07001068 return -1;
brian m. carlsone82caf32017-07-13 23:49:28 +00001069 oidcpy(oid, &o->oid);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001070 return 0;
Junio C Hamano5385f522005-10-13 18:57:40 -07001071 }
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001072
1073 /*
1074 * At this point, the syntax look correct, so
1075 * if we do not get the needed object, we should
1076 * barf.
1077 */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001078 o = repo_peel_to_type(r, name, len, o, expected_type);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001079 if (!o)
Junio C Hamano81776312007-12-24 00:51:01 -08001080 return -1;
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001081
brian m. carlsone82caf32017-07-13 23:49:28 +00001082 oidcpy(oid, &o->oid);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001083 if (sp[0] == '/') {
1084 /* "$commit^{/foo}" */
1085 char *prefix;
1086 int ret;
1087 struct commit_list *list = NULL;
1088
Nguyễn Thái Ngọc Duy43228422010-12-15 16:02:54 +07001089 /*
1090 * $commit^{/}. Some regex implementation may reject.
1091 * We don't need regex anyway. '' pattern always matches.
1092 */
1093 if (sp[1] == '}')
1094 return 0;
1095
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001096 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
1097 commit_list_insert((struct commit *)o, &list);
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001098 ret = get_oid_oneline(r, prefix, oid, list);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001099 free(prefix);
1100 return ret;
Junio C Hamano5385f522005-10-13 18:57:40 -07001101 }
1102 return 0;
1103}
1104
Nguyễn Thái Ngọc Duy0c6b5ba2019-04-16 16:33:30 +07001105static int get_describe_name(struct repository *r,
1106 const char *name, int len,
1107 struct object_id *oid)
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001108{
1109 const char *cp;
brian m. carlson321c89b2017-07-13 23:49:29 +00001110 unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001111
1112 for (cp = name + len - 1; name + 2 <= cp; cp--) {
1113 char ch = *cp;
René Scharfe6f75d452015-03-09 23:46:54 +01001114 if (!isxdigit(ch)) {
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001115 /* We must be looking at g in "SOMETHING-g"
1116 * for it to be describe output.
1117 */
1118 if (ch == 'g' && cp[-1] == '-') {
1119 cp++;
1120 len -= cp - name;
Nguyễn Thái Ngọc Duy0c6b5ba2019-04-16 16:33:30 +07001121 return get_short_oid(r,
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +07001122 cp, len, oid, flags);
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001123 }
1124 }
1125 }
1126 return -1;
1127}
1128
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001129static enum get_oid_result get_oid_1(struct repository *r,
1130 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -05001131 struct object_id *oid,
1132 unsigned lookup_flags)
Junio C Hamano9938af62005-08-03 22:15:49 -07001133{
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001134 int ret, has_suffix;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001135 const char *cp;
Junio C Hamano9938af62005-08-03 22:15:49 -07001136
Linus Torvalds621ff672008-03-14 11:49:40 -07001137 /*
1138 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001139 */
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001140 has_suffix = 0;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001141 for (cp = name + len - 1; name <= cp; cp--) {
1142 int ch = *cp;
1143 if ('0' <= ch && ch <= '9')
1144 continue;
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001145 if (ch == '~' || ch == '^')
1146 has_suffix = ch;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001147 break;
1148 }
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001149
1150 if (has_suffix) {
René Scharfe59fa5f52019-09-15 14:10:28 +02001151 unsigned int num = 0;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001152 int len1 = cp - name;
1153 cp++;
René Scharfe59fa5f52019-09-15 14:10:28 +02001154 while (cp < name + len) {
1155 unsigned int digit = *cp++ - '0';
1156 if (unsigned_mult_overflows(num, 10))
1157 return MISSING_OBJECT;
1158 num *= 10;
1159 if (unsigned_add_overflows(num, digit))
1160 return MISSING_OBJECT;
1161 num += digit;
1162 }
Linus Torvalds621ff672008-03-14 11:49:40 -07001163 if (!num && len1 == len - 1)
1164 num = 1;
René Scharfe59fa5f52019-09-15 14:10:28 +02001165 else if (num > INT_MAX)
1166 return MISSING_OBJECT;
Linus Torvalds621ff672008-03-14 11:49:40 -07001167 if (has_suffix == '^')
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001168 return get_parent(r, name, len1, oid, num);
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001169 /* else if (has_suffix == '~') -- goes without saying */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001170 return get_nth_ancestor(r, name, len1, oid, num);
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001171 }
1172
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001173 ret = peel_onion(r, name, len, oid, lookup_flags);
Junio C Hamano5385f522005-10-13 18:57:40 -07001174 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001175 return FOUND;
Junio C Hamano5385f522005-10-13 18:57:40 -07001176
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001177 ret = get_oid_basic(r, name, len, oid, lookup_flags);
Junio C Hamano9938af62005-08-03 22:15:49 -07001178 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001179 return FOUND;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001180
1181 /* It could be describe output that is "SOMETHING-gXXXX" */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001182 ret = get_describe_name(r, name, len, oid);
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001183 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001184 return FOUND;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001185
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001186 return get_short_oid(r, name, len, oid, lookup_flags);
Junio C Hamano9938af62005-08-03 22:15:49 -07001187}
1188
Junio C Hamanof7bff002010-08-02 14:37:06 -07001189/*
1190 * This interprets names like ':/Initial revision of "git"' by searching
1191 * through history and returning the first commit whose message starts
Junio C Hamano3d045892010-08-12 18:32:49 -07001192 * the given regular expression.
Junio C Hamanof7bff002010-08-02 14:37:06 -07001193 *
Will Palmer07698542016-01-30 17:06:01 -07001194 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1195 *
1196 * For a literal '!' character at the beginning of a pattern, you have to repeat
1197 * that, like: ':/!!foo'
1198 *
1199 * For future extension, all other sequences beginning with ':/!' are reserved.
Junio C Hamanof7bff002010-08-02 14:37:06 -07001200 */
Nguyễn Thái Ngọc Duy208acbf2014-03-25 20:23:26 +07001201
1202/* Remember to update object flag allocation in object.h */
Junio C Hamanof7bff002010-08-02 14:37:06 -07001203#define ONELINE_SEEN (1u<<20)
1204
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001205struct handle_one_ref_cb {
1206 struct repository *repo;
1207 struct commit_list **list;
1208};
1209
Michael Haggerty9c5fe0b2015-05-25 18:39:05 +00001210static int handle_one_ref(const char *path, const struct object_id *oid,
1211 int flag, void *cb_data)
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001212{
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001213 struct handle_one_ref_cb *cb = cb_data;
1214 struct commit_list **list = cb->list;
1215 struct object *object = parse_object(cb->repo, oid);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001216 if (!object)
1217 return 0;
Martin Koegleraffeef12008-02-18 08:31:54 +01001218 if (object->type == OBJ_TAG) {
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001219 object = deref_tag(cb->repo, object, path,
Stefan Bellera74093d2018-06-28 18:22:05 -07001220 strlen(path));
Martin Koegleraffeef12008-02-18 08:31:54 +01001221 if (!object)
1222 return 0;
1223 }
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001224 if (object->type != OBJ_COMMIT)
1225 return 0;
René Scharfee8d1dfe2014-08-21 20:30:29 +02001226 commit_list_insert((struct commit *)object, list);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001227 return 0;
1228}
1229
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001230static int get_oid_oneline(struct repository *r,
1231 const char *prefix, struct object_id *oid,
1232 struct commit_list *list)
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001233{
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001234 struct commit_list *backup = NULL, *l;
Junio C Hamano28042db2010-12-12 22:19:00 -08001235 int found = 0;
Will Palmer07698542016-01-30 17:06:01 -07001236 int negative = 0;
Linus Torvalds57895102010-04-23 08:20:20 -07001237 regex_t regex;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001238
1239 if (prefix[0] == '!') {
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001240 prefix++;
Will Palmer07698542016-01-30 17:06:01 -07001241
1242 if (prefix[0] == '-') {
1243 prefix++;
1244 negative = 1;
1245 } else if (prefix[0] != '!') {
Junio C Hamanoe6a6a762016-02-24 13:25:52 -08001246 return -1;
Will Palmer07698542016-01-30 17:06:01 -07001247 }
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001248 }
Linus Torvalds57895102010-04-23 08:20:20 -07001249
1250 if (regcomp(&regex, prefix, REG_EXTENDED))
Jeff Kingaac4fac2016-02-10 16:19:25 -05001251 return -1;
Linus Torvalds57895102010-04-23 08:20:20 -07001252
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001253 for (l = list; l; l = l->next) {
1254 l->item->object.flags |= ONELINE_SEEN;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001255 commit_list_insert(l->item, &backup);
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001256 }
Jim Meyeringed8ad7e2007-03-11 19:49:08 +01001257 while (list) {
Jeff Kingba41c1c2014-06-10 17:41:02 -04001258 const char *p, *buf;
Linus Torvalds1358e7d2007-03-12 11:30:38 -07001259 struct commit *commit;
Junio C Hamano28042db2010-12-12 22:19:00 -08001260 int matches;
Jim Meyeringed8ad7e2007-03-11 19:49:08 +01001261
1262 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001263 if (!parse_object(r, &commit->object.oid))
Martin Koegler283cdbc2008-02-18 21:47:53 +01001264 continue;
Jeff King8597ea32014-06-10 17:44:13 -04001265 buf = get_commit_buffer(commit, NULL);
Jeff Kingba41c1c2014-06-10 17:41:02 -04001266 p = strstr(buf, "\n\n");
Will Palmer07698542016-01-30 17:06:01 -07001267 matches = negative ^ (p && !regexec(&regex, p + 2, 0, NULL, 0));
Jeff Kingba41c1c2014-06-10 17:41:02 -04001268 unuse_commit_buffer(commit, buf);
Junio C Hamano28042db2010-12-12 22:19:00 -08001269
1270 if (matches) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001271 oidcpy(oid, &commit->object.oid);
Junio C Hamano28042db2010-12-12 22:19:00 -08001272 found = 1;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001273 break;
1274 }
1275 }
Linus Torvalds57895102010-04-23 08:20:20 -07001276 regfree(&regex);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001277 free_commit_list(list);
1278 for (l = backup; l; l = l->next)
1279 clear_commit_marks(l->item, ONELINE_SEEN);
Junio C Hamano28042db2010-12-12 22:19:00 -08001280 free_commit_list(backup);
1281 return found ? 0 : -1;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001282}
1283
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001284struct grab_nth_branch_switch_cbdata {
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001285 int remaining;
René Scharfe4b3aa172019-09-18 18:35:38 +02001286 struct strbuf *sb;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001287};
1288
brian m. carlson9461d272017-02-21 23:47:32 +00001289static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid,
Johannes Schindelindddbad72017-04-26 21:29:31 +02001290 const char *email, timestamp_t timestamp, int tz,
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001291 const char *message, void *cb_data)
1292{
1293 struct grab_nth_branch_switch_cbdata *cb = cb_data;
Thomas Rasta884d0c2009-01-17 17:09:54 +01001294 const char *match = NULL, *target = NULL;
1295 size_t len;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001296
Jeff King95b567c2014-06-18 15:48:29 -04001297 if (skip_prefix(message, "checkout: moving from ", &match))
Junio C Hamanod7c03c12009-01-21 00:37:38 -08001298 target = strstr(match, " to ");
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001299
Junio C Hamanoc8297742009-01-19 16:44:08 -08001300 if (!match || !target)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001301 return 0;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001302 if (--(cb->remaining) == 0) {
1303 len = target - match;
René Scharfe4b3aa172019-09-18 18:35:38 +02001304 strbuf_reset(cb->sb);
1305 strbuf_add(cb->sb, match, len);
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001306 return 1; /* we are done */
1307 }
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001308 return 0;
1309}
1310
1311/*
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001312 * Parse @{-N} syntax, return the number of characters parsed
1313 * if successful; otherwise signal an error with negative value.
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001314 */
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001315static int interpret_nth_prior_checkout(struct repository *r,
1316 const char *name, int namelen,
Jeff King8cd42492014-01-15 03:31:57 -05001317 struct strbuf *buf)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001318{
Junio C Hamanoc2883e62009-01-19 00:04:25 -08001319 long nth;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001320 int retval;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001321 struct grab_nth_branch_switch_cbdata cb;
Thomas Rasta884d0c2009-01-17 17:09:54 +01001322 const char *brace;
1323 char *num_end;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001324
Jeff King8cd42492014-01-15 03:31:57 -05001325 if (namelen < 4)
1326 return -1;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001327 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
1328 return -1;
Jeff King8cd42492014-01-15 03:31:57 -05001329 brace = memchr(name, '}', namelen);
Thomas Rasta884d0c2009-01-17 17:09:54 +01001330 if (!brace)
1331 return -1;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001332 nth = strtol(name + 3, &num_end, 10);
Thomas Rasta884d0c2009-01-17 17:09:54 +01001333 if (num_end != brace)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001334 return -1;
Junio C Hamanoc2883e62009-01-19 00:04:25 -08001335 if (nth <= 0)
1336 return -1;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001337 cb.remaining = nth;
René Scharfe4b3aa172019-09-18 18:35:38 +02001338 cb.sb = buf;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001339
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001340 retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r),
1341 "HEAD", grab_nth_branch_switch, &cb);
1342 if (0 < retval) {
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001343 retval = brace - name + 1;
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001344 } else
1345 retval = 0;
Junio C Hamano39765e52009-01-19 21:58:31 -08001346
Junio C Hamano39765e52009-01-19 21:58:31 -08001347 return retval;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001348}
1349
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001350int repo_get_oid_mb(struct repository *r,
1351 const char *name,
1352 struct object_id *oid)
Junio C Hamano619a6442009-10-18 12:34:56 -07001353{
1354 struct commit *one, *two;
1355 struct commit_list *mbs;
brian m. carlson151b2912016-09-05 20:08:07 +00001356 struct object_id oid_tmp;
Junio C Hamano619a6442009-10-18 12:34:56 -07001357 const char *dots;
1358 int st;
1359
1360 dots = strstr(name, "...");
1361 if (!dots)
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001362 return repo_get_oid(r, name, oid);
Junio C Hamano619a6442009-10-18 12:34:56 -07001363 if (dots == name)
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001364 st = repo_get_oid(r, "HEAD", &oid_tmp);
Junio C Hamano619a6442009-10-18 12:34:56 -07001365 else {
1366 struct strbuf sb;
1367 strbuf_init(&sb, dots - name);
1368 strbuf_add(&sb, name, dots - name);
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001369 st = repo_get_oid_committish(r, sb.buf, &oid_tmp);
Junio C Hamano619a6442009-10-18 12:34:56 -07001370 strbuf_release(&sb);
1371 }
1372 if (st)
1373 return st;
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001374 one = lookup_commit_reference_gently(r, &oid_tmp, 0);
Junio C Hamano619a6442009-10-18 12:34:56 -07001375 if (!one)
1376 return -1;
1377
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001378 if (repo_get_oid_committish(r, dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
Junio C Hamano619a6442009-10-18 12:34:56 -07001379 return -1;
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001380 two = lookup_commit_reference_gently(r, &oid_tmp, 0);
Junio C Hamano619a6442009-10-18 12:34:56 -07001381 if (!two)
1382 return -1;
Nguyễn Thái Ngọc Duy34e77712019-06-27 16:28:52 +07001383 mbs = repo_get_merge_bases(r, one, two);
Junio C Hamano619a6442009-10-18 12:34:56 -07001384 if (!mbs || mbs->next)
1385 st = -1;
1386 else {
1387 st = 0;
brian m. carlson151b2912016-09-05 20:08:07 +00001388 oidcpy(oid, &mbs->item->object.oid);
Junio C Hamano619a6442009-10-18 12:34:56 -07001389 }
1390 free_commit_list(mbs);
1391 return st;
1392}
1393
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001394/* parse @something syntax, when 'something' is not {.*} */
1395static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1396{
1397 const char *next;
1398
1399 if (len || name[1] == '{')
1400 return -1;
1401
1402 /* make sure it's a single @, or @@{.*}, not @foo */
Jeff King8cd42492014-01-15 03:31:57 -05001403 next = memchr(name + len + 1, '@', namelen - len - 1);
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001404 if (next && next[1] != '{')
1405 return -1;
1406 if (!next)
1407 next = name + namelen;
1408 if (next != name + 1)
1409 return -1;
1410
1411 strbuf_reset(buf);
1412 strbuf_add(buf, "HEAD", 4);
1413 return 1;
1414}
1415
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001416static int reinterpret(struct repository *r,
1417 const char *name, int namelen, int len,
Jeff King0e9f62d2017-03-02 03:23:01 -05001418 struct strbuf *buf, unsigned allowed)
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001419{
1420 /* we have extra data, which might need further processing */
1421 struct strbuf tmp = STRBUF_INIT;
1422 int used = buf->len;
1423 int ret;
Jonathan Tana4f66a72020-09-01 15:28:07 -07001424 struct interpret_branch_name_options options = {
1425 .allowed = allowed
1426 };
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001427
1428 strbuf_add(buf, name + len, namelen - len);
Jonathan Tana4f66a72020-09-01 15:28:07 -07001429 ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, &options);
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001430 /* that data was not interpreted, remove our cruft */
1431 if (ret < 0) {
1432 strbuf_setlen(buf, used);
1433 return len;
1434 }
1435 strbuf_reset(buf);
1436 strbuf_addbuf(buf, &tmp);
1437 strbuf_release(&tmp);
1438 /* tweak for size of {-N} versus expanded ref name */
1439 return ret - used + len;
1440}
1441
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001442static void set_shortened_ref(struct repository *r, struct strbuf *buf, const char *ref)
Jeff Kinga39c14a2014-01-15 03:26:33 -05001443{
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001444 char *s = refs_shorten_unambiguous_ref(get_main_ref_store(r), ref, 0);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001445 strbuf_reset(buf);
1446 strbuf_addstr(buf, s);
1447 free(s);
1448}
1449
Jeff King0e9f62d2017-03-02 03:23:01 -05001450static int branch_interpret_allowed(const char *refname, unsigned allowed)
1451{
1452 if (!allowed)
1453 return 1;
1454
1455 if ((allowed & INTERPRET_BRANCH_LOCAL) &&
1456 starts_with(refname, "refs/heads/"))
1457 return 1;
1458 if ((allowed & INTERPRET_BRANCH_REMOTE) &&
1459 starts_with(refname, "refs/remotes/"))
1460 return 1;
1461
1462 return 0;
1463}
1464
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001465static int interpret_branch_mark(struct repository *r,
1466 const char *name, int namelen,
Jeff King48c58472015-05-21 00:45:43 -04001467 int at, struct strbuf *buf,
1468 int (*get_mark)(const char *, int),
1469 const char *(*get_data)(struct branch *,
Jeff King0e9f62d2017-03-02 03:23:01 -05001470 struct strbuf *),
Jonathan Tana4f66a72020-09-01 15:28:07 -07001471 const struct interpret_branch_name_options *options)
Jeff Kinga39c14a2014-01-15 03:26:33 -05001472{
1473 int len;
Jeff King48c58472015-05-21 00:45:43 -04001474 struct branch *branch;
1475 struct strbuf err = STRBUF_INIT;
1476 const char *value;
Jeff Kinga39c14a2014-01-15 03:26:33 -05001477
Jeff King48c58472015-05-21 00:45:43 -04001478 len = get_mark(name + at, namelen - at);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001479 if (!len)
1480 return -1;
1481
Jeff King3f6eb302014-01-15 03:37:23 -05001482 if (memchr(name, ':', at))
1483 return -1;
1484
Jeff King48c58472015-05-21 00:45:43 -04001485 if (at) {
1486 char *name_str = xmemdupz(name, at);
1487 branch = branch_get(name_str);
1488 free(name_str);
1489 } else
1490 branch = branch_get(NULL);
1491
1492 value = get_data(branch, &err);
Jonathan Tanf24c30e2020-09-01 15:28:09 -07001493 if (!value) {
1494 if (options->nonfatal_dangling_mark) {
1495 strbuf_release(&err);
1496 return -1;
1497 } else {
1498 die("%s", err.buf);
1499 }
1500 }
Jeff King48c58472015-05-21 00:45:43 -04001501
Jonathan Tana4f66a72020-09-01 15:28:07 -07001502 if (!branch_interpret_allowed(value, options->allowed))
Jeff King0e9f62d2017-03-02 03:23:01 -05001503 return -1;
1504
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001505 set_shortened_ref(r, buf, value);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001506 return len + at;
1507}
1508
Nguyễn Thái Ngọc Duy8f56e9d2019-04-06 18:34:26 +07001509int repo_interpret_branch_name(struct repository *r,
1510 const char *name, int namelen,
1511 struct strbuf *buf,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001512 const struct interpret_branch_name_options *options)
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001513{
Jeff Kingf278f402014-01-15 03:27:32 -05001514 char *at;
Jeff King9892d5d2014-01-15 03:40:46 -05001515 const char *start;
Jeff King13228c32017-02-27 04:25:40 -05001516 int len;
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001517
Felipe Contrerascf99a762013-09-02 01:34:29 -05001518 if (!namelen)
1519 namelen = strlen(name);
1520
Jonathan Tana4f66a72020-09-01 15:28:07 -07001521 if (!options->allowed || (options->allowed & INTERPRET_BRANCH_LOCAL)) {
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001522 len = interpret_nth_prior_checkout(r, name, namelen, buf);
Jeff King0e9f62d2017-03-02 03:23:01 -05001523 if (!len) {
1524 return len; /* syntax Ok, not enough switches */
1525 } else if (len > 0) {
1526 if (len == namelen)
1527 return len; /* consumed all */
1528 else
Jonathan Tana4f66a72020-09-01 15:28:07 -07001529 return reinterpret(r, name, namelen, len, buf,
1530 options->allowed);
Jeff King0e9f62d2017-03-02 03:23:01 -05001531 }
Jeff Kingd46a8302010-01-28 04:52:22 -05001532 }
1533
Jeff King9892d5d2014-01-15 03:40:46 -05001534 for (start = name;
1535 (at = memchr(start, '@', namelen - (start - name)));
1536 start = at + 1) {
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001537
Jonathan Tana4f66a72020-09-01 15:28:07 -07001538 if (!options->allowed || (options->allowed & INTERPRET_BRANCH_HEAD)) {
Jeff King0e9f62d2017-03-02 03:23:01 -05001539 len = interpret_empty_at(name, namelen, at - name, buf);
1540 if (len > 0)
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001541 return reinterpret(r, name, namelen, len, buf,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001542 options->allowed);
Jeff King0e9f62d2017-03-02 03:23:01 -05001543 }
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001544
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001545 len = interpret_branch_mark(r, name, namelen, at - name, buf,
Jeff King0e9f62d2017-03-02 03:23:01 -05001546 upstream_mark, branch_get_upstream,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001547 options);
Jeff King9892d5d2014-01-15 03:40:46 -05001548 if (len > 0)
1549 return len;
Jeff Kingadfe5d02015-05-21 00:45:47 -04001550
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001551 len = interpret_branch_mark(r, name, namelen, at - name, buf,
Jeff King0e9f62d2017-03-02 03:23:01 -05001552 push_mark, branch_get_push,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001553 options);
Zbigniew Jędrzejewski-Szmek64720282012-04-14 09:54:35 +02001554 if (len > 0)
Zbigniew Jędrzejewski-Szmek17c82212012-04-14 09:54:34 +02001555 return len;
Zbigniew Jędrzejewski-Szmekbb0dab52012-04-14 09:54:33 +02001556 }
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001557
Jeff Kinga39c14a2014-01-15 03:26:33 -05001558 return -1;
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001559}
1560
Jeff King0e9f62d2017-03-02 03:23:01 -05001561void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001562{
1563 int len = strlen(name);
Jonathan Tana4f66a72020-09-01 15:28:07 -07001564 struct interpret_branch_name_options options = {
1565 .allowed = allowed
1566 };
1567 int used = interpret_branch_name(name, len, sb, &options);
Junio C Hamano84cf2462013-05-15 14:32:30 -07001568
Junio C Hamano84cf2462013-05-15 14:32:30 -07001569 if (used < 0)
1570 used = 0;
1571 strbuf_add(sb, name + used, len - used);
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001572}
1573
1574int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1575{
Junio C Hamano7c3f8472017-10-17 00:08:08 -07001576 if (startup_info->have_repository)
1577 strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
1578 else
1579 strbuf_addstr(sb, name);
Junio C Hamanoa625b092017-11-14 17:12:58 +05301580
1581 /*
1582 * This splice must be done even if we end up rejecting the
1583 * name; builtin/branch.c::copy_or_rename_branch() still wants
1584 * to see what the name expanded to so that "branch -m" can be
1585 * used as a tool to correct earlier mistakes.
1586 */
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001587 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
Junio C Hamanoa625b092017-11-14 17:12:58 +05301588
1589 if (*name == '-' ||
1590 !strcmp(sb->buf, "refs/heads/HEAD"))
1591 return -1;
1592
Michael Haggerty8d9c5012011-09-15 23:10:25 +02001593 return check_refname_format(sb->buf, 0);
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001594}
1595
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001596/*
brian m. carlsone82caf32017-07-13 23:49:28 +00001597 * This is like "get_oid_basic()", except it allows "object ID expressions",
Junio C Hamano9938af62005-08-03 22:15:49 -07001598 * notably "xyz^" for "parent of xyz"
1599 */
Nguyễn Thái Ngọc Duyec580ea2019-04-16 16:33:37 +07001600int repo_get_oid(struct repository *r, const char *name, struct object_id *oid)
brian m. carlson2764fd92016-04-17 23:10:36 +00001601{
brian m. carlsone82caf32017-07-13 23:49:28 +00001602 struct object_context unused;
Nguyễn Thái Ngọc Duyec580ea2019-04-16 16:33:37 +07001603 return get_oid_with_context(r, name, 0, oid, &unused);
brian m. carlson2764fd92016-04-17 23:10:36 +00001604}
1605
Paul-Sebastian Ungureanuf5116f42019-02-25 23:16:05 +00001606/*
1607 * This returns a non-zero value if the string (built using printf
1608 * format and the given arguments) is not a valid object.
1609 */
1610int get_oidf(struct object_id *oid, const char *fmt, ...)
1611{
1612 va_list ap;
1613 int ret;
1614 struct strbuf sb = STRBUF_INIT;
1615
1616 va_start(ap, fmt);
1617 strbuf_vaddf(&sb, fmt, ap);
1618 va_end(ap);
1619
1620 ret = get_oid(sb.buf, oid);
1621 strbuf_release(&sb);
1622
1623 return ret;
1624}
brian m. carlson2764fd92016-04-17 23:10:36 +00001625
1626/*
Richard Hansena8a54062013-09-04 15:04:31 -04001627 * Many callers know that the user meant to name a commit-ish by
Junio C Hamanocd74e472012-07-02 12:04:52 -07001628 * syntactical positions where the object name appears. Calling this
1629 * function allows the machinery to disambiguate shorter-than-unique
Richard Hansena8a54062013-09-04 15:04:31 -04001630 * abbreviated object names between commit-ish and others.
Junio C Hamanocd74e472012-07-02 12:04:52 -07001631 *
1632 * Note that this does NOT error out when the named object is not a
Richard Hansena8a54062013-09-04 15:04:31 -04001633 * commit-ish. It is merely to give a hint to the disambiguation
Junio C Hamanocd74e472012-07-02 12:04:52 -07001634 * machinery.
1635 */
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001636int repo_get_oid_committish(struct repository *r,
1637 const char *name,
1638 struct object_id *oid)
Junio C Hamanocd74e472012-07-02 12:04:52 -07001639{
1640 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001641 return get_oid_with_context(r, name, GET_OID_COMMITTISH,
brian m. carlsone82caf32017-07-13 23:49:28 +00001642 oid, &unused);
Junio C Hamanocd74e472012-07-02 12:04:52 -07001643}
1644
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001645int repo_get_oid_treeish(struct repository *r,
1646 const char *name,
1647 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001648{
1649 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001650 return get_oid_with_context(r, name, GET_OID_TREEISH,
brian m. carlsone82caf32017-07-13 23:49:28 +00001651 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001652}
1653
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001654int repo_get_oid_commit(struct repository *r,
1655 const char *name,
1656 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001657{
1658 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001659 return get_oid_with_context(r, name, GET_OID_COMMIT,
brian m. carlsone82caf32017-07-13 23:49:28 +00001660 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001661}
1662
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001663int repo_get_oid_tree(struct repository *r,
1664 const char *name,
1665 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001666{
1667 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001668 return get_oid_with_context(r, name, GET_OID_TREE,
brian m. carlsone82caf32017-07-13 23:49:28 +00001669 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001670}
1671
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001672int repo_get_oid_blob(struct repository *r,
1673 const char *name,
1674 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001675{
1676 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001677 return get_oid_with_context(r, name, GET_OID_BLOB,
brian m. carlsone82caf32017-07-13 23:49:28 +00001678 oid, &unused);
Martin Koeglera0cd87a2007-04-23 22:55:05 +02001679}
1680
Matthieu Moy009fee42009-12-07 11:10:50 +01001681/* Must be called only when object_name:filename doesn't exist. */
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001682static void diagnose_invalid_oid_path(struct repository *r,
1683 const char *prefix,
brian m. carlsone82caf32017-07-13 23:49:28 +00001684 const char *filename,
1685 const struct object_id *tree_oid,
1686 const char *object_name,
1687 int object_name_len)
Matthieu Moy009fee42009-12-07 11:10:50 +01001688{
brian m. carlsone82caf32017-07-13 23:49:28 +00001689 struct object_id oid;
Elijah Newren5ec1e722019-04-05 08:00:12 -07001690 unsigned short mode;
Matthieu Moy009fee42009-12-07 11:10:50 +01001691
1692 if (!prefix)
1693 prefix = "";
1694
René Scharfedbe44fa2015-05-19 23:44:23 +02001695 if (file_exists(filename))
Jeff Kingb0418302020-01-24 19:13:01 -05001696 die(_("path '%s' exists on disk, but not in '%.*s'"),
René Scharfeb2981d02013-03-16 19:29:31 +01001697 filename, object_name_len, object_name);
Junio C Hamanoc7054202017-05-30 09:23:33 +09001698 if (is_missing_file_error(errno)) {
Jeff Kingb2724c82014-06-19 17:26:56 -04001699 char *fullname = xstrfmt("%s%s", prefix, filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01001700
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001701 if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
Jeff Kingb0418302020-01-24 19:13:01 -05001702 die(_("path '%s' exists, but not '%s'\n"
1703 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
Matthieu Moy009fee42009-12-07 11:10:50 +01001704 fullname,
1705 filename,
René Scharfeb2981d02013-03-16 19:29:31 +01001706 object_name_len, object_name,
Michael J Grubere41d7182011-03-31 11:17:34 +02001707 fullname,
René Scharfeb2981d02013-03-16 19:29:31 +01001708 object_name_len, object_name,
Michael J Grubere41d7182011-03-31 11:17:34 +02001709 filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01001710 }
Jeff Kingb0418302020-01-24 19:13:01 -05001711 die(_("path '%s' does not exist in '%.*s'"),
René Scharfeb2981d02013-03-16 19:29:31 +01001712 filename, object_name_len, object_name);
Matthieu Moy009fee42009-12-07 11:10:50 +01001713 }
1714}
1715
1716/* Must be called only when :stage:filename doesn't exist. */
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001717static void diagnose_invalid_index_path(struct repository *r,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001718 int stage,
Matthieu Moy009fee42009-12-07 11:10:50 +01001719 const char *prefix,
1720 const char *filename)
1721{
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001722 struct index_state *istate = r->index;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07001723 const struct cache_entry *ce;
Matthieu Moy009fee42009-12-07 11:10:50 +01001724 int pos;
1725 unsigned namelen = strlen(filename);
Jeff King43bb66a2015-09-24 17:07:52 -04001726 struct strbuf fullname = STRBUF_INIT;
Matthieu Moy009fee42009-12-07 11:10:50 +01001727
1728 if (!prefix)
1729 prefix = "";
1730
1731 /* Wrong stage number? */
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001732 pos = index_name_pos(istate, filename, namelen);
Matthieu Moy009fee42009-12-07 11:10:50 +01001733 if (pos < 0)
1734 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001735 if (pos < istate->cache_nr) {
1736 ce = istate->cache[pos];
Markus Heidelberg77e84662010-02-28 16:49:15 +01001737 if (ce_namelen(ce) == namelen &&
1738 !memcmp(ce->name, filename, namelen))
Jeff Kingb0418302020-01-24 19:13:01 -05001739 die(_("path '%s' is in the index, but not at stage %d\n"
1740 "hint: Did you mean ':%d:%s'?"),
Markus Heidelberg77e84662010-02-28 16:49:15 +01001741 filename, stage,
1742 ce_stage(ce), filename);
1743 }
Matthieu Moy009fee42009-12-07 11:10:50 +01001744
1745 /* Confusion between relative and absolute filenames? */
Jeff King43bb66a2015-09-24 17:07:52 -04001746 strbuf_addstr(&fullname, prefix);
1747 strbuf_addstr(&fullname, filename);
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001748 pos = index_name_pos(istate, fullname.buf, fullname.len);
Matthieu Moy009fee42009-12-07 11:10:50 +01001749 if (pos < 0)
1750 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001751 if (pos < istate->cache_nr) {
1752 ce = istate->cache[pos];
Jeff King43bb66a2015-09-24 17:07:52 -04001753 if (ce_namelen(ce) == fullname.len &&
1754 !memcmp(ce->name, fullname.buf, fullname.len))
Jeff Kingb0418302020-01-24 19:13:01 -05001755 die(_("path '%s' is in the index, but not '%s'\n"
1756 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
Jeff King43bb66a2015-09-24 17:07:52 -04001757 fullname.buf, filename,
1758 ce_stage(ce), fullname.buf,
Michael J Grubere41d7182011-03-31 11:17:34 +02001759 ce_stage(ce), filename);
Markus Heidelberg77e84662010-02-28 16:49:15 +01001760 }
Matthieu Moy009fee42009-12-07 11:10:50 +01001761
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001762 if (repo_file_exists(r, filename))
Jeff Kingb0418302020-01-24 19:13:01 -05001763 die(_("path '%s' exists on disk, but not in the index"), filename);
Junio C Hamanoc7054202017-05-30 09:23:33 +09001764 if (is_missing_file_error(errno))
Jeff Kingb0418302020-01-24 19:13:01 -05001765 die(_("path '%s' does not exist (neither on disk nor in the index)"),
Matthieu Moy009fee42009-12-07 11:10:50 +01001766 filename);
1767
Jeff King43bb66a2015-09-24 17:07:52 -04001768 strbuf_release(&fullname);
Matthieu Moy009fee42009-12-07 11:10:50 +01001769}
1770
1771
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001772static char *resolve_relative_path(struct repository *r, const char *rel)
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001773{
Christian Couder59556542013-11-30 21:55:40 +01001774 if (!starts_with(rel, "./") && !starts_with(rel, "../"))
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001775 return NULL;
1776
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001777 if (r != the_repository || !is_inside_work_tree())
Jeff Kingb0418302020-01-24 19:13:01 -05001778 die(_("relative path syntax can't be used outside working tree"));
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001779
1780 /* die() inside prefix_path() if resolved path is outside worktree */
1781 return prefix_path(startup_info->prefix,
1782 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1783 rel);
1784}
1785
Junio C Hamano7589e632019-02-06 22:05:22 -08001786static enum get_oid_result get_oid_with_context_1(struct repository *repo,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001787 const char *name,
brian m. carlsone82caf32017-07-13 23:49:28 +00001788 unsigned flags,
1789 const char *prefix,
1790 struct object_id *oid,
1791 struct object_context *oc)
Clément Poulain573285e2010-06-09 19:02:06 +02001792{
Martin Koeglera0cd87a2007-04-23 22:55:05 +02001793 int ret, bracket_depth;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001794 int namelen = strlen(name);
1795 const char *cp;
brian m. carlson321c89b2017-07-13 23:49:29 +00001796 int only_to_die = flags & GET_OID_ONLY_TO_DIE;
Linus Torvalds51196022006-04-18 16:45:16 -07001797
Jeff King7243ffd2016-09-26 07:59:15 -04001798 if (only_to_die)
brian m. carlson321c89b2017-07-13 23:49:29 +00001799 flags |= GET_OID_QUIETLY;
Jeff King7243ffd2016-09-26 07:59:15 -04001800
Clément Poulain573285e2010-06-09 19:02:06 +02001801 memset(oc, 0, sizeof(*oc));
1802 oc->mode = S_IFINVALID;
Jeff Kingd72cae12017-05-19 08:52:25 -04001803 strbuf_init(&oc->symlink_path, 0);
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001804 ret = get_oid_1(repo, name, namelen, oid, flags);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001805 if (!ret)
1806 return ret;
Junio C Hamano33bd5982012-07-02 10:32:11 -07001807 /*
Martin Ågren1e6771e2020-12-31 12:56:20 +01001808 * tree:path --> object name of path in tree
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001809 * :path -> object name of absolute path in index
1810 * :./path -> object name of path relative to cwd in index
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001811 * :[0-3]:path -> object name of path in index at stage
Matthieu Moy95ad6d22010-09-24 18:43:59 +02001812 * :/foo -> recent commit matching foo
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001813 */
1814 if (name[0] == ':') {
1815 int stage = 0;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07001816 const struct cache_entry *ce;
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001817 char *new_path = NULL;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001818 int pos;
Junio C Hamano2e83b662011-05-10 12:02:54 -07001819 if (!only_to_die && namelen > 2 && name[1] == '/') {
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001820 struct handle_one_ref_cb cb;
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001821 struct commit_list *list = NULL;
Michael Haggerty2b2a5be2015-05-25 18:38:28 +00001822
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001823 cb.repo = repo;
1824 cb.list = &list;
Junio C Hamano5ff4b922020-04-09 17:03:45 -07001825 refs_for_each_ref(get_main_ref_store(repo), handle_one_ref, &cb);
Jeff King02204612020-04-09 23:04:11 -04001826 refs_head_ref(get_main_ref_store(repo), handle_one_ref, &cb);
René Scharfee8d1dfe2014-08-21 20:30:29 +02001827 commit_list_sort_by_date(&list);
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001828 return get_oid_oneline(repo, name + 2, oid, list);
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001829 }
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001830 if (namelen < 3 ||
1831 name[2] != ':' ||
1832 name[1] < '0' || '3' < name[1])
1833 cp = name + 1;
1834 else {
1835 stage = name[1] - '0';
1836 cp = name + 3;
Linus Torvalds51196022006-04-18 16:45:16 -07001837 }
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001838 new_path = resolve_relative_path(repo, cp);
Junio C Hamano3d6e0f72010-12-09 13:38:05 -08001839 if (!new_path) {
1840 namelen = namelen - (cp - name);
1841 } else {
1842 cp = new_path;
1843 namelen = strlen(cp);
1844 }
Clément Poulain573285e2010-06-09 19:02:06 +02001845
brian m. carlson321c89b2017-07-13 23:49:29 +00001846 if (flags & GET_OID_RECORD_PATH)
Jeff Kingdc944b62017-05-19 08:54:43 -04001847 oc->path = xstrdup(cp);
Clément Poulain573285e2010-06-09 19:02:06 +02001848
Jeff King581d2fd2019-05-14 09:54:55 -04001849 if (!repo->index || !repo->index->cache)
Nguyễn Thái Ngọc Duyefe461b2019-04-16 16:33:36 +07001850 repo_read_index(repo);
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001851 pos = index_name_pos(repo->index, cp, namelen);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001852 if (pos < 0)
1853 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001854 while (pos < repo->index->cache_nr) {
1855 ce = repo->index->cache[pos];
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001856 if (ce_namelen(ce) != namelen ||
1857 memcmp(ce->name, cp, namelen))
1858 break;
1859 if (ce_stage(ce) == stage) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001860 oidcpy(oid, &ce->oid);
Kirill Smelkov90064712010-09-29 15:35:24 +04001861 oc->mode = ce->ce_mode;
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001862 free(new_path);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001863 return 0;
1864 }
Junio C Hamanoe7cef452006-05-08 15:44:06 -07001865 pos++;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001866 }
Junio C Hamano2e83b662011-05-10 12:02:54 -07001867 if (only_to_die && name[1] && name[1] != '/')
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001868 diagnose_invalid_index_path(repo, stage, prefix, cp);
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001869 free(new_path);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001870 return -1;
1871 }
Shawn Pearcecce91a22006-05-19 03:29:43 -04001872 for (cp = name, bracket_depth = 0; *cp; cp++) {
1873 if (*cp == '{')
1874 bracket_depth++;
1875 else if (bracket_depth && *cp == '}')
1876 bracket_depth--;
1877 else if (!bracket_depth && *cp == ':')
1878 break;
1879 }
1880 if (*cp == ':') {
brian m. carlsone82caf32017-07-13 23:49:28 +00001881 struct object_id tree_oid;
René Scharfeb2981d02013-03-16 19:29:31 +01001882 int len = cp - name;
Jeff King8a10fea2016-09-26 07:59:41 -04001883 unsigned sub_flags = flags;
1884
brian m. carlson321c89b2017-07-13 23:49:29 +00001885 sub_flags &= ~GET_OID_DISAMBIGUATORS;
1886 sub_flags |= GET_OID_TREEISH;
Jeff King8a10fea2016-09-26 07:59:41 -04001887
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001888 if (!get_oid_1(repo, name, len, &tree_oid, sub_flags)) {
Matthieu Moy009fee42009-12-07 11:10:50 +01001889 const char *filename = cp+1;
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001890 char *new_filename = NULL;
1891
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001892 new_filename = resolve_relative_path(repo, filename);
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001893 if (new_filename)
1894 filename = new_filename;
brian m. carlson321c89b2017-07-13 23:49:29 +00001895 if (flags & GET_OID_FOLLOW_SYMLINKS) {
Nguyễn Thái Ngọc Duy0dd1f0c2019-06-27 16:28:50 +07001896 ret = get_tree_entry_follow_symlinks(repo, &tree_oid,
brian m. carlson3b683bc2018-05-02 00:25:40 +00001897 filename, oid, &oc->symlink_path,
David Turnerc4ec9672015-05-20 13:03:39 -04001898 &oc->mode);
1899 } else {
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001900 ret = get_tree_entry(repo, &tree_oid, filename, oid,
brian m. carlson916bc352018-03-12 02:27:51 +00001901 &oc->mode);
David Turnerc4ec9672015-05-20 13:03:39 -04001902 if (ret && only_to_die) {
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001903 diagnose_invalid_oid_path(repo, prefix,
David Turnerc4ec9672015-05-20 13:03:39 -04001904 filename,
brian m. carlsone82caf32017-07-13 23:49:28 +00001905 &tree_oid,
David Turnerc4ec9672015-05-20 13:03:39 -04001906 name, len);
1907 }
Matthieu Moy009fee42009-12-07 11:10:50 +01001908 }
brian m. carlson321c89b2017-07-13 23:49:29 +00001909 if (flags & GET_OID_RECORD_PATH)
Jeff Kingdc944b62017-05-19 08:54:43 -04001910 oc->path = xstrdup(filename);
Clément Poulain573285e2010-06-09 19:02:06 +02001911
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001912 free(new_filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01001913 return ret;
1914 } else {
Junio C Hamano2e83b662011-05-10 12:02:54 -07001915 if (only_to_die)
Jeff Kingb0418302020-01-24 19:13:01 -05001916 die(_("invalid object name '%.*s'."), len, name);
Matthieu Moy009fee42009-12-07 11:10:50 +01001917 }
Linus Torvalds51196022006-04-18 16:45:16 -07001918 }
1919 return ret;
Junio C Hamano9938af62005-08-03 22:15:49 -07001920}
Junio C Hamanof01cc142012-07-02 10:19:35 -07001921
Junio C Hamano8c135ea2012-07-02 11:01:25 -07001922/*
1923 * Call this function when you know "name" given by the end user must
1924 * name an object but it doesn't; the function _may_ die with a better
1925 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1926 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1927 * you have a chance to diagnose the error further.
1928 */
Nguyễn Thái Ngọc Duye270f422019-04-16 16:33:39 +07001929void maybe_die_on_misspelt_object_name(struct repository *r,
1930 const char *name,
1931 const char *prefix)
Junio C Hamanof01cc142012-07-02 10:19:35 -07001932{
1933 struct object_context oc;
brian m. carlsone82caf32017-07-13 23:49:28 +00001934 struct object_id oid;
Nguyễn Thái Ngọc Duye270f422019-04-16 16:33:39 +07001935 get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001936 prefix, &oid, &oc);
Junio C Hamano8c135ea2012-07-02 11:01:25 -07001937}
1938
Duy Nguyen127b48f2019-02-12 19:43:23 +07001939enum get_oid_result get_oid_with_context(struct repository *repo,
1940 const char *str,
1941 unsigned flags,
1942 struct object_id *oid,
1943 struct object_context *oc)
Junio C Hamanof01cc142012-07-02 10:19:35 -07001944{
brian m. carlson321c89b2017-07-13 23:49:29 +00001945 if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
Martin Ågren1e6771e2020-12-31 12:56:20 +01001946 BUG("incompatible flags for get_oid_with_context");
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001947 return get_oid_with_context_1(repo, str, flags, NULL, oid, oc);
Junio C Hamanof01cc142012-07-02 10:19:35 -07001948}