blob: 2dd1a0f56e1e442dec47dfbbcdd46d58aecc812c [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"
Ævar Arnfjörð Bjarmason88c7b4c2022-02-16 09:14:02 +010018#include "date.h"
Junio C Hamano9938af62005-08-03 22:15:49 -070019
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +070020static 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 +070021
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070022typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070023
24struct disambiguate_state {
Jeff King00160432016-09-26 08:00:04 -040025 int len; /* length of prefix in hex chars */
brian m. carlsondc015052017-03-26 16:01:24 +000026 char hex_pfx[GIT_MAX_HEXSZ + 1];
brian m. carlsond2ee1182017-03-26 16:01:33 +000027 struct object_id bin_pfx;
Jeff King00160432016-09-26 08:00:04 -040028
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070029 struct repository *repo;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070030 disambiguate_hint_fn fn;
31 void *cb_data;
brian m. carlsond2ee1182017-03-26 16:01:33 +000032 struct object_id candidate;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070033 unsigned candidate_exists:1;
34 unsigned candidate_checked:1;
35 unsigned candidate_ok:1;
36 unsigned disambiguate_fn_used:1;
37 unsigned ambiguous:1;
Junio C Hamano957d7402012-07-03 14:21:59 -070038 unsigned always_call_fn:1;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070039};
40
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000041static void update_candidates(struct disambiguate_state *ds, const struct object_id *current)
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070042{
Junio C Hamano957d7402012-07-03 14:21:59 -070043 if (ds->always_call_fn) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070044 ds->ambiguous = ds->fn(ds->repo, current, ds->cb_data) ? 1 : 0;
Junio C Hamano957d7402012-07-03 14:21:59 -070045 return;
46 }
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070047 if (!ds->candidate_exists) {
48 /* this is the first candidate */
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000049 oidcpy(&ds->candidate, current);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070050 ds->candidate_exists = 1;
51 return;
Jeff King4a7e27e2018-08-28 17:22:40 -040052 } else if (oideq(&ds->candidate, current)) {
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070053 /* the same as what we already have seen */
54 return;
55 }
56
57 if (!ds->fn) {
58 /* cannot disambiguate between ds->candidate and current */
59 ds->ambiguous = 1;
60 return;
61 }
62
63 if (!ds->candidate_checked) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070064 ds->candidate_ok = ds->fn(ds->repo, &ds->candidate, ds->cb_data);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070065 ds->disambiguate_fn_used = 1;
66 ds->candidate_checked = 1;
67 }
68
69 if (!ds->candidate_ok) {
Ondřej Bílka749f7632013-07-22 23:02:23 +020070 /* discard the candidate; we know it does not satisfy fn */
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000071 oidcpy(&ds->candidate, current);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070072 ds->candidate_checked = 0;
73 return;
74 }
75
76 /* if we reach this point, we know ds->candidate satisfies fn */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070077 if (ds->fn(ds->repo, current, ds->cb_data)) {
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070078 /*
79 * if both current and candidate satisfy fn, we cannot
80 * disambiguate.
81 */
82 ds->candidate_ok = 0;
83 ds->ambiguous = 1;
84 }
85
86 /* otherwise, current can be discarded and candidate is still good */
87}
88
Martin Ågren1e6771e2020-12-31 12:56:20 +010089static int match_hash(unsigned, const unsigned char *, const unsigned char *);
René Scharfecc817ca2017-06-22 20:19:48 +020090
Eric Wong92d8ed82021-07-07 23:10:19 +000091static enum cb_next match_prefix(const struct object_id *oid, void *arg)
92{
93 struct disambiguate_state *ds = arg;
94 /* no need to call match_hash, oidtree_each did prefix match */
95 update_candidates(ds, oid);
96 return ds->ambiguous ? CB_BREAK : CB_CONTINUE;
97}
98
Jeff King00160432016-09-26 08:00:04 -040099static void find_short_object_filename(struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700100{
Jeff King263db402018-11-12 09:48:47 -0500101 struct object_directory *odb;
Junio C Hamano9938af62005-08-03 22:15:49 -0700102
Eric Wong92d8ed82021-07-07 23:10:19 +0000103 for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next)
104 oidtree_each(odb_loose_cache(odb, &ds->bin_pfx),
105 &ds->bin_pfx, ds->len, match_prefix, ds);
Junio C Hamano9938af62005-08-03 22:15:49 -0700106}
107
Martin Ågren1e6771e2020-12-31 12:56:20 +0100108static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b)
Junio C Hamano9938af62005-08-03 22:15:49 -0700109{
110 do {
111 if (*a != *b)
112 return 0;
113 a++;
114 b++;
115 len -= 2;
116 } while (len > 1);
117 if (len)
118 if ((*a ^ *b) & 0xf0)
119 return 0;
120 return 1;
121}
122
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400123static void unique_in_midx(struct multi_pack_index *m,
124 struct disambiguate_state *ds)
125{
126 uint32_t num, i, first = 0;
127 const struct object_id *current = NULL;
128 num = m->num_objects;
129
130 if (!num)
131 return;
132
133 bsearch_midx(&ds->bin_pfx, m, &first);
134
135 /*
136 * At this point, "first" is the location of the lowest object
137 * with an object name that could match "bin_pfx". See if we have
138 * 0, 1 or more objects that actually match(es).
139 */
140 for (i = first; i < num && !ds->ambiguous; i++) {
141 struct object_id oid;
142 current = nth_midxed_object_oid(&oid, m, i);
Martin Ågren1e6771e2020-12-31 12:56:20 +0100143 if (!match_hash(ds->len, ds->bin_pfx.hash, current->hash))
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400144 break;
145 update_candidates(ds, current);
146 }
147}
148
Jeff King00160432016-09-26 08:00:04 -0400149static void unique_in_pack(struct packed_git *p,
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700150 struct disambiguate_state *ds)
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700151{
René Scharfe902f5a22018-03-24 17:41:08 +0100152 uint32_t num, i, first = 0;
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700153
Derrick Stoleeaf96fe32019-04-29 09:18:56 -0700154 if (p->multi_pack_index)
155 return;
156
Derrick Stolee0e87b852017-10-12 08:02:20 -0400157 if (open_pack_index(p) || !p->num_objects)
158 return;
159
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700160 num = p->num_objects;
René Scharfe902f5a22018-03-24 17:41:08 +0100161 bsearch_pack(&ds->bin_pfx, p, &first);
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700162
163 /*
164 * At this point, "first" is the location of the lowest object
Junio C Hamano1703f9a2012-06-20 22:35:43 -0700165 * with an object name that could match "bin_pfx". See if we have
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700166 * 0, 1 or more objects that actually match(es).
167 */
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700168 for (i = first; i < num && !ds->ambiguous; i++) {
brian m. carlsond2b7d9c2017-03-26 16:01:34 +0000169 struct object_id oid;
Jeff King07636712020-02-23 23:27:36 -0500170 nth_packed_object_id(&oid, p, i);
Martin Ågren1e6771e2020-12-31 12:56:20 +0100171 if (!match_hash(ds->len, ds->bin_pfx.hash, oid.hash))
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700172 break;
Jeff King07636712020-02-23 23:27:36 -0500173 update_candidates(ds, &oid);
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700174 }
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700175}
176
Jeff King00160432016-09-26 08:00:04 -0400177static void find_short_packed_object(struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700178{
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400179 struct multi_pack_index *m;
Junio C Hamano9938af62005-08-03 22:15:49 -0700180 struct packed_git *p;
181
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700182 for (m = get_multi_pack_index(ds->repo); m && !ds->ambiguous;
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400183 m = m->next)
184 unique_in_midx(m, ds);
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700185 for (p = get_packed_git(ds->repo); p && !ds->ambiguous;
Stefan Bellera80d72d2018-03-23 18:20:59 +0100186 p = p->next)
Jeff King00160432016-09-26 08:00:04 -0400187 unique_in_pack(p, ds);
Junio C Hamano99a19b42005-10-02 21:40:51 -0700188}
189
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700190static int finish_object_disambiguation(struct disambiguate_state *ds,
brian m. carlsone82caf32017-07-13 23:49:28 +0000191 struct object_id *oid)
Junio C Hamano99a19b42005-10-02 21:40:51 -0700192{
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700193 if (ds->ambiguous)
194 return SHORT_NAME_AMBIGUOUS;
Junio C Hamano99a19b42005-10-02 21:40:51 -0700195
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700196 if (!ds->candidate_exists)
David Turnerd1dd94b2019-01-17 23:19:43 -0500197 return MISSING_OBJECT;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700198
199 if (!ds->candidate_checked)
200 /*
201 * If this is the only candidate, there is no point
202 * calling the disambiguation hint callback.
203 *
204 * On the other hand, if the current candidate
205 * replaced an earlier candidate that did _not_ pass
206 * the disambiguation hint callback, then we do have
207 * more than one objects that match the short name
208 * given, so we should make sure this one matches;
209 * otherwise, if we discovered this one and the one
210 * that we previously discarded in the reverse order,
211 * we would end up showing different results in the
212 * same repository!
213 */
214 ds->candidate_ok = (!ds->disambiguate_fn_used ||
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700215 ds->fn(ds->repo, &ds->candidate, ds->cb_data));
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700216
217 if (!ds->candidate_ok)
Junio C Hamano013f2762005-10-11 15:22:48 -0700218 return SHORT_NAME_AMBIGUOUS;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700219
brian m. carlsone82caf32017-07-13 23:49:28 +0000220 oidcpy(oid, &ds->candidate);
Junio C Hamano9938af62005-08-03 22:15:49 -0700221 return 0;
222}
223
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700224static int disambiguate_commit_only(struct repository *r,
225 const struct object_id *oid,
226 void *cb_data_unused)
Junio C Hamano9938af62005-08-03 22:15:49 -0700227{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700228 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700229 return kind == OBJ_COMMIT;
230}
Junio C Hamano9938af62005-08-03 22:15:49 -0700231
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700232static int disambiguate_committish_only(struct repository *r,
233 const struct object_id *oid,
234 void *cb_data_unused)
Junio C Hamanoe2643612012-07-02 10:00:40 -0700235{
236 struct object *obj;
237 int kind;
238
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700239 kind = oid_object_info(r, oid, NULL);
Junio C Hamanoe2643612012-07-02 10:00:40 -0700240 if (kind == OBJ_COMMIT)
241 return 1;
242 if (kind != OBJ_TAG)
243 return 0;
244
245 /* We need to do this the hard way... */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700246 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
Junio C Hamanoe2643612012-07-02 10:00:40 -0700247 if (obj && obj->type == OBJ_COMMIT)
248 return 1;
249 return 0;
250}
251
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700252static int disambiguate_tree_only(struct repository *r,
253 const struct object_id *oid,
254 void *cb_data_unused)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700255{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700256 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700257 return kind == OBJ_TREE;
258}
259
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700260static int disambiguate_treeish_only(struct repository *r,
261 const struct object_id *oid,
262 void *cb_data_unused)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700263{
264 struct object *obj;
265 int kind;
266
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700267 kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700268 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
269 return 1;
270 if (kind != OBJ_TAG)
271 return 0;
272
273 /* We need to do this the hard way... */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700274 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700275 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
276 return 1;
277 return 0;
278}
279
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700280static int disambiguate_blob_only(struct repository *r,
281 const struct object_id *oid,
282 void *cb_data_unused)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700283{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700284 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700285 return kind == OBJ_BLOB;
286}
287
Jeff King5b33cb12016-09-27 08:38:01 -0400288static disambiguate_hint_fn default_disambiguate_hint;
289
290int set_disambiguate_hint_config(const char *var, const char *value)
291{
292 static const struct {
293 const char *name;
294 disambiguate_hint_fn fn;
295 } hints[] = {
296 { "none", NULL },
297 { "commit", disambiguate_commit_only },
298 { "committish", disambiguate_committish_only },
299 { "tree", disambiguate_tree_only },
300 { "treeish", disambiguate_treeish_only },
301 { "blob", disambiguate_blob_only }
302 };
303 int i;
304
305 if (!value)
306 return config_error_nonbool(var);
307
308 for (i = 0; i < ARRAY_SIZE(hints); i++) {
309 if (!strcasecmp(value, hints[i].name)) {
310 default_disambiguate_hint = hints[i].fn;
311 return 0;
312 }
313 }
314
315 return error("unknown hint type for '%s': %s", var, value);
316}
317
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700318static int init_object_disambiguation(struct repository *r,
319 const char *name, int len,
Jeff King00160432016-09-26 08:00:04 -0400320 struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700321{
Junio C Hamano957d7402012-07-03 14:21:59 -0700322 int i;
Junio C Hamano9938af62005-08-03 22:15:49 -0700323
brian m. carlson7b38efa2018-07-16 01:27:58 +0000324 if (len < MINIMUM_ABBREV || len > the_hash_algo->hexsz)
Jeff King00160432016-09-26 08:00:04 -0400325 return -1;
326
327 memset(ds, 0, sizeof(*ds));
Jeff King00160432016-09-26 08:00:04 -0400328
Linus Torvaldsaf61c6e2005-09-19 15:16:03 -0700329 for (i = 0; i < len ;i++) {
Junio C Hamano9938af62005-08-03 22:15:49 -0700330 unsigned char c = name[i];
331 unsigned char val;
Junio C Hamano9938af62005-08-03 22:15:49 -0700332 if (c >= '0' && c <= '9')
333 val = c - '0';
334 else if (c >= 'a' && c <= 'f')
335 val = c - 'a' + 10;
336 else if (c >= 'A' && c <='F') {
337 val = c - 'A' + 10;
338 c -= 'A' - 'a';
339 }
340 else
341 return -1;
Jeff King00160432016-09-26 08:00:04 -0400342 ds->hex_pfx[i] = c;
Junio C Hamano9938af62005-08-03 22:15:49 -0700343 if (!(i & 1))
344 val <<= 4;
brian m. carlsond2ee1182017-03-26 16:01:33 +0000345 ds->bin_pfx.hash[i >> 1] |= val;
Junio C Hamano9938af62005-08-03 22:15:49 -0700346 }
Jeff King00160432016-09-26 08:00:04 -0400347
348 ds->len = len;
Jeff King59e4e342016-09-26 08:00:07 -0400349 ds->hex_pfx[len] = '\0';
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700350 ds->repo = r;
351 prepare_alt_odb(r);
Junio C Hamano957d7402012-07-03 14:21:59 -0700352 return 0;
353}
Junio C Hamano99a19b42005-10-02 21:40:51 -0700354
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100355struct ambiguous_output {
356 const struct disambiguate_state *ds;
357 struct strbuf advice;
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100358 struct strbuf sb;
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100359};
360
brian m. carlson1b7ba792017-03-31 01:39:59 +0000361static int show_ambiguous_object(const struct object_id *oid, void *data)
Jeff King1ffa26c2016-09-26 08:00:36 -0400362{
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100363 struct ambiguous_output *state = data;
364 const struct disambiguate_state *ds = state->ds;
365 struct strbuf *advice = &state->advice;
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100366 struct strbuf *sb = &state->sb;
Jeff King1ffa26c2016-09-26 08:00:36 -0400367 int type;
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100368 const char *hash;
Jeff King1ffa26c2016-09-26 08:00:36 -0400369
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700370 if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data))
Jeff King1ffa26c2016-09-26 08:00:36 -0400371 return 0;
372
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100373 hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV);
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700374 type = oid_object_info(ds->repo, oid, NULL);
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100375
376 if (type < 0) {
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100377 /*
378 * TRANSLATORS: This is a line of ambiguous object
379 * output shown when we cannot look up or parse the
380 * object in question. E.g. "deadbeef [bad object]".
381 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100382 strbuf_addf(sb, _("%s [bad object]"), hash);
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100383 goto out;
384 }
385
386 assert(type == OBJ_TREE || type == OBJ_COMMIT ||
387 type == OBJ_BLOB || type == OBJ_TAG);
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100388
Jeff King1ffa26c2016-09-26 08:00:36 -0400389 if (type == OBJ_COMMIT) {
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100390 struct strbuf date = STRBUF_INIT;
391 struct strbuf msg = STRBUF_INIT;
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700392 struct commit *commit = lookup_commit(ds->repo, oid);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100393
Jeff King1ffa26c2016-09-26 08:00:36 -0400394 if (commit) {
395 struct pretty_print_context pp = {0};
396 pp.date_mode.type = DATE_SHORT;
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100397 format_commit_message(commit, "%ad", &date, &pp);
398 format_commit_message(commit, "%s", &msg, &pp);
Jeff King1ffa26c2016-09-26 08:00:36 -0400399 }
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100400
401 /*
402 * TRANSLATORS: This is a line of ambiguous commit
403 * object output. E.g.:
404 *
405 * "deadbeef commit 2021-01-01 - Some Commit Message"
406 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100407 strbuf_addf(sb, _("%s commit %s - %s"), hash, date.buf,
408 msg.buf);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100409
410 strbuf_release(&date);
411 strbuf_release(&msg);
Jeff King1ffa26c2016-09-26 08:00:36 -0400412 } else if (type == OBJ_TAG) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700413 struct tag *tag = lookup_tag(ds->repo, oid);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100414
415 if (!parse_tag(tag) && tag->tag) {
416 /*
417 * TRANSLATORS: This is a line of ambiguous
418 * tag object output. E.g.:
419 *
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100420 * "deadbeef tag 2022-01-01 - Some Tag Message"
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100421 *
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100422 * The second argument is the YYYY-MM-DD found
423 * in the tag.
424 *
425 * The third argument is the "tag" string
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100426 * from object.c.
427 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100428 strbuf_addf(sb, _("%s tag %s - %s"), hash,
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100429 show_date(tag->date, 0, DATE_MODE(SHORT)),
430 tag->tag);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100431 } else {
432 /*
433 * TRANSLATORS: This is a line of ambiguous
434 * tag object output where we couldn't parse
435 * the tag itself. E.g.:
436 *
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100437 * "deadbeef [bad tag, could not parse it]"
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100438 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100439 strbuf_addf(sb, _("%s [bad tag, could not parse it]"),
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100440 hash);
441 }
442 } else if (type == OBJ_TREE) {
443 /*
444 * TRANSLATORS: This is a line of ambiguous <type>
445 * object output. E.g. "deadbeef tree".
446 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100447 strbuf_addf(sb, _("%s tree"), hash);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100448 } else if (type == OBJ_BLOB) {
449 /*
450 * TRANSLATORS: This is a line of ambiguous <type>
451 * object output. E.g. "deadbeef blob".
452 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100453 strbuf_addf(sb, _("%s blob"), hash);
Jeff King1ffa26c2016-09-26 08:00:36 -0400454 }
455
Jeff King1ffa26c2016-09-26 08:00:36 -0400456
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100457out:
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100458 /*
459 * TRANSLATORS: This is line item of ambiguous object output
460 * from describe_ambiguous_object() above. For RTL languages
461 * you'll probably want to swap the "%s" and leading " " space
462 * around.
463 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100464 strbuf_addf(advice, _(" %s\n"), sb->buf);
Jeff King1ffa26c2016-09-26 08:00:36 -0400465
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100466 strbuf_reset(sb);
Jeff King1ffa26c2016-09-26 08:00:36 -0400467 return 0;
468}
469
Ævar Arnfjörð Bjarmasona885c932018-05-10 12:43:01 +0000470static int collect_ambiguous(const struct object_id *oid, void *data)
471{
472 oid_array_append(data, oid);
473 return 0;
474}
475
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700476static int repo_collect_ambiguous(struct repository *r,
477 const struct object_id *oid,
478 void *data)
479{
480 return collect_ambiguous(oid, data);
481}
482
René Scharfe7cfcb162019-08-20 20:49:12 +0200483static int sort_ambiguous(const void *a, const void *b, void *ctx)
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000484{
René Scharfe7cfcb162019-08-20 20:49:12 +0200485 struct repository *sort_ambiguous_repo = ctx;
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700486 int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
487 int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000488 int a_type_sort;
489 int b_type_sort;
490
491 /*
492 * Sorts by hash within the same object type, just as
493 * oid_array_for_each_unique() would do.
494 */
495 if (a_type == b_type)
496 return oidcmp(a, b);
497
498 /*
499 * Between object types show tags, then commits, and finally
500 * trees and blobs.
501 *
502 * The object_type enum is commit, tree, blob, tag, but we
503 * want tag, commit, tree blob. Cleverly (perhaps too
504 * cleverly) do that with modulus, since the enum assigns 1 to
505 * commit, so tag becomes 0.
506 */
507 a_type_sort = a_type % 4;
508 b_type_sort = b_type % 4;
509 return a_type_sort > b_type_sort ? 1 : -1;
510}
511
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700512static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
513{
René Scharfe7cfcb162019-08-20 20:49:12 +0200514 QSORT_S(a->oid, a->nr, sort_ambiguous, r);
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700515}
516
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700517static enum get_oid_result get_short_oid(struct repository *r,
518 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -0500519 struct object_id *oid,
520 unsigned flags)
Junio C Hamano957d7402012-07-03 14:21:59 -0700521{
522 int status;
Junio C Hamano957d7402012-07-03 14:21:59 -0700523 struct disambiguate_state ds;
brian m. carlson321c89b2017-07-13 23:49:29 +0000524 int quietly = !!(flags & GET_OID_QUIETLY);
Junio C Hamano957d7402012-07-03 14:21:59 -0700525
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700526 if (init_object_disambiguation(r, name, len, &ds) < 0)
Junio C Hamano957d7402012-07-03 14:21:59 -0700527 return -1;
Jeff King259942f2016-09-26 07:59:01 -0400528
brian m. carlson321c89b2017-07-13 23:49:29 +0000529 if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
Johannes Schindelin033abf92018-05-02 11:38:39 +0200530 BUG("multiple get_short_oid disambiguator flags");
Jeff King259942f2016-09-26 07:59:01 -0400531
brian m. carlson321c89b2017-07-13 23:49:29 +0000532 if (flags & GET_OID_COMMIT)
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700533 ds.fn = disambiguate_commit_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000534 else if (flags & GET_OID_COMMITTISH)
Junio C Hamanoe2643612012-07-02 10:00:40 -0700535 ds.fn = disambiguate_committish_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000536 else if (flags & GET_OID_TREE)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700537 ds.fn = disambiguate_tree_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000538 else if (flags & GET_OID_TREEISH)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700539 ds.fn = disambiguate_treeish_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000540 else if (flags & GET_OID_BLOB)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700541 ds.fn = disambiguate_blob_only;
Jeff King5b33cb12016-09-27 08:38:01 -0400542 else
543 ds.fn = default_disambiguate_hint;
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700544
Jeff King00160432016-09-26 08:00:04 -0400545 find_short_object_filename(&ds);
546 find_short_packed_object(&ds);
brian m. carlsone82caf32017-07-13 23:49:28 +0000547 status = finish_object_disambiguation(&ds, oid);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700548
Johannes Schindelin6d67a992019-03-13 03:16:34 -0700549 /*
550 * If we didn't find it, do the usual reprepare() slow-path,
551 * since the object may have recently been added to the repository
552 * or migrated from loose to packed.
553 */
554 if (status == MISSING_OBJECT) {
Nguyễn Thái Ngọc Duy34e77712019-06-27 16:28:52 +0700555 reprepare_packed_git(r);
Johannes Schindelin6d67a992019-03-13 03:16:34 -0700556 find_short_object_filename(&ds);
557 find_short_packed_object(&ds);
558 status = finish_object_disambiguation(&ds, oid);
559 }
560
Jeff King1ffa26c2016-09-26 08:00:36 -0400561 if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000562 struct oid_array collect = OID_ARRAY_INIT;
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100563 struct ambiguous_output out = {
564 .ds = &ds,
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100565 .sb = STRBUF_INIT,
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100566 .advice = STRBUF_INIT,
567 };
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000568
Martin Ågren1e6771e2020-12-31 12:56:20 +0100569 error(_("short object ID %s is ambiguous"), ds.hex_pfx);
Jeff King1ffa26c2016-09-26 08:00:36 -0400570
571 /*
572 * We may still have ambiguity if we simply saw a series of
573 * candidates that did not satisfy our hint function. In
574 * that case, we still want to show them, so disable the hint
575 * function entirely.
576 */
577 if (!ds.ambiguous)
578 ds.fn = NULL;
579
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700580 repo_for_each_abbrev(r, ds.hex_pfx, collect_ambiguous, &collect);
581 sort_ambiguous_oid_array(r, &collect);
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000582
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100583 if (oid_array_for_each(&collect, show_ambiguous_object, &out))
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000584 BUG("show_ambiguous_object shouldn't return non-zero");
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100585
586 /*
587 * TRANSLATORS: The argument is the list of ambiguous
588 * objects composed in show_ambiguous_object(). See
589 * its "TRANSLATORS" comments for details.
590 */
591 advise(_("The candidates are:\n%s"), out.advice.buf);
592
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000593 oid_array_clear(&collect);
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100594 strbuf_release(&out.advice);
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100595 strbuf_release(&out.sb);
Jeff King1ffa26c2016-09-26 08:00:36 -0400596 }
597
Junio C Hamano013f2762005-10-11 15:22:48 -0700598 return status;
599}
600
Nguyễn Thái Ngọc Duy4e99f2d2019-04-16 16:33:24 +0700601int repo_for_each_abbrev(struct repository *r, const char *prefix,
602 each_abbrev_fn fn, void *cb_data)
Junio C Hamano957d7402012-07-03 14:21:59 -0700603{
brian m. carlson910650d2017-03-31 01:40:00 +0000604 struct oid_array collect = OID_ARRAY_INIT;
Junio C Hamano957d7402012-07-03 14:21:59 -0700605 struct disambiguate_state ds;
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400606 int ret;
Junio C Hamano957d7402012-07-03 14:21:59 -0700607
Nguyễn Thái Ngọc Duy4e99f2d2019-04-16 16:33:24 +0700608 if (init_object_disambiguation(r, prefix, strlen(prefix), &ds) < 0)
Junio C Hamano957d7402012-07-03 14:21:59 -0700609 return -1;
610
Junio C Hamano957d7402012-07-03 14:21:59 -0700611 ds.always_call_fn = 1;
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700612 ds.fn = repo_collect_ambiguous;
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400613 ds.cb_data = &collect;
Jeff King00160432016-09-26 08:00:04 -0400614 find_short_object_filename(&ds);
615 find_short_packed_object(&ds);
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400616
brian m. carlson910650d2017-03-31 01:40:00 +0000617 ret = oid_array_for_each_unique(&collect, fn, cb_data);
618 oid_array_clear(&collect);
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400619 return ret;
Junio C Hamano957d7402012-07-03 14:21:59 -0700620}
621
Jeff King8e3f52d2016-10-03 19:47:28 -0400622/*
623 * Return the slot of the most-significant bit set in "val". There are various
624 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
625 * probably not a big deal here.
626 */
627static unsigned msb(unsigned long val)
628{
629 unsigned r = 0;
630 while (val >>= 1)
631 r++;
632 return r;
633}
634
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400635struct min_abbrev_data {
636 unsigned int init_len;
637 unsigned int cur_len;
638 char *hex;
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700639 struct repository *repo;
brian m. carlson626fd982018-03-22 13:40:08 -0400640 const struct object_id *oid;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400641};
642
Derrick Stoleea42d6fd2017-10-12 08:02:19 -0400643static inline char get_hex_char_from_oid(const struct object_id *oid,
644 unsigned int pos)
645{
646 static const char hex[] = "0123456789abcdef";
647
648 if ((pos & 1) == 0)
649 return hex[oid->hash[pos >> 1] >> 4];
650 else
651 return hex[oid->hash[pos >> 1] & 0xf];
652}
653
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400654static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
655{
656 struct min_abbrev_data *mad = cb_data;
657
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400658 unsigned int i = mad->init_len;
Derrick Stoleea42d6fd2017-10-12 08:02:19 -0400659 while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400660 i++;
661
662 if (i < GIT_MAX_RAWSZ && i >= mad->cur_len)
663 mad->cur_len = i + 1;
664
665 return 0;
666}
667
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700668static int repo_extend_abbrev_len(struct repository *r,
669 const struct object_id *oid,
670 void *cb_data)
671{
672 return extend_abbrev_len(oid, cb_data);
673}
674
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400675static void find_abbrev_len_for_midx(struct multi_pack_index *m,
676 struct min_abbrev_data *mad)
677{
678 int match = 0;
679 uint32_t num, first = 0;
680 struct object_id oid;
681 const struct object_id *mad_oid;
682
683 if (!m->num_objects)
684 return;
685
686 num = m->num_objects;
687 mad_oid = mad->oid;
688 match = bsearch_midx(mad_oid, m, &first);
689
690 /*
691 * first is now the position in the packfile where we would insert
692 * mad->hash if it does not exist (or the position of mad->hash if
693 * it does exist). Hence, we consider a maximum of two objects
694 * nearby for the abbreviation length.
695 */
696 mad->init_len = 0;
697 if (!match) {
698 if (nth_midxed_object_oid(&oid, m, first))
699 extend_abbrev_len(&oid, mad);
700 } else if (first < num - 1) {
701 if (nth_midxed_object_oid(&oid, m, first + 1))
702 extend_abbrev_len(&oid, mad);
703 }
704 if (first > 0) {
705 if (nth_midxed_object_oid(&oid, m, first - 1))
706 extend_abbrev_len(&oid, mad);
707 }
708 mad->init_len = mad->cur_len;
709}
710
Derrick Stolee0e87b852017-10-12 08:02:20 -0400711static void find_abbrev_len_for_pack(struct packed_git *p,
712 struct min_abbrev_data *mad)
713{
714 int match = 0;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400715 uint32_t num, first = 0;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400716 struct object_id oid;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400717 const struct object_id *mad_oid;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400718
Derrick Stoleeaf96fe32019-04-29 09:18:56 -0700719 if (p->multi_pack_index)
720 return;
721
Derrick Stolee0e87b852017-10-12 08:02:20 -0400722 if (open_pack_index(p) || !p->num_objects)
723 return;
724
725 num = p->num_objects;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400726 mad_oid = mad->oid;
727 match = bsearch_pack(mad_oid, p, &first);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400728
729 /*
730 * first is now the position in the packfile where we would insert
731 * mad->hash if it does not exist (or the position of mad->hash if
Derrick Stolee21abed52018-02-27 06:47:04 -0500732 * it does exist). Hence, we consider a maximum of two objects
Derrick Stolee0e87b852017-10-12 08:02:20 -0400733 * nearby for the abbreviation length.
734 */
735 mad->init_len = 0;
736 if (!match) {
Jeff King07636712020-02-23 23:27:36 -0500737 if (!nth_packed_object_id(&oid, p, first))
Derrick Stolee21abed52018-02-27 06:47:04 -0500738 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400739 } else if (first < num - 1) {
Jeff King07636712020-02-23 23:27:36 -0500740 if (!nth_packed_object_id(&oid, p, first + 1))
Derrick Stolee21abed52018-02-27 06:47:04 -0500741 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400742 }
743 if (first > 0) {
Jeff King07636712020-02-23 23:27:36 -0500744 if (!nth_packed_object_id(&oid, p, first - 1))
Derrick Stolee21abed52018-02-27 06:47:04 -0500745 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400746 }
747 mad->init_len = mad->cur_len;
748}
749
750static void find_abbrev_len_packed(struct min_abbrev_data *mad)
751{
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400752 struct multi_pack_index *m;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400753 struct packed_git *p;
754
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700755 for (m = get_multi_pack_index(mad->repo); m; m = m->next)
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400756 find_abbrev_len_for_midx(m, mad);
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700757 for (p = get_packed_git(mad->repo); p; p = p->next)
Derrick Stolee0e87b852017-10-12 08:02:20 -0400758 find_abbrev_len_for_pack(p, mad);
759}
760
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700761int repo_find_unique_abbrev_r(struct repository *r, char *hex,
762 const struct object_id *oid, int len)
Junio C Hamano013f2762005-10-11 15:22:48 -0700763{
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400764 struct disambiguate_state ds;
765 struct min_abbrev_data mad;
766 struct object_id oid_ret;
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700767 const unsigned hexsz = r->hash_algo->hexsz;
brian m. carlson7b38efa2018-07-16 01:27:58 +0000768
Linus Torvaldse6c587c2016-09-30 17:19:37 -0700769 if (len < 0) {
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700770 unsigned long count = repo_approximate_object_count(r);
Jeff King8e3f52d2016-10-03 19:47:28 -0400771 /*
772 * Add one because the MSB only tells us the highest bit set,
773 * not including the value of all the _other_ bits (so "15"
774 * is only one off of 2^4, but the MSB is the 3rd bit.
775 */
776 len = msb(count) + 1;
777 /*
778 * We now know we have on the order of 2^len objects, which
779 * expects a collision at 2^(len/2). But we also care about hex
780 * chars, not bits, and there are 4 bits per hex. So all
René Scharfe42c78a22017-07-08 12:35:35 +0200781 * together we need to divide by 2 and round up.
Jeff King8e3f52d2016-10-03 19:47:28 -0400782 */
René Scharfe42c78a22017-07-08 12:35:35 +0200783 len = DIV_ROUND_UP(len, 2);
Jeff King8e3f52d2016-10-03 19:47:28 -0400784 /*
785 * For very small repos, we stick with our regular fallback.
786 */
787 if (len < FALLBACK_DEFAULT_ABBREV)
788 len = FALLBACK_DEFAULT_ABBREV;
Linus Torvaldse6c587c2016-09-30 17:19:37 -0700789 }
Jeff King8e3f52d2016-10-03 19:47:28 -0400790
brian m. carlsonaab95832018-03-12 02:27:30 +0000791 oid_to_hex_r(hex, oid);
brian m. carlson7b38efa2018-07-16 01:27:58 +0000792 if (len == hexsz || !len)
793 return hexsz;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400794
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700795 mad.repo = r;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400796 mad.init_len = len;
797 mad.cur_len = len;
798 mad.hex = hex;
brian m. carlson626fd982018-03-22 13:40:08 -0400799 mad.oid = oid;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400800
801 find_abbrev_len_packed(&mad);
802
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700803 if (init_object_disambiguation(r, hex, mad.cur_len, &ds) < 0)
Derrick Stolee0e87b852017-10-12 08:02:20 -0400804 return -1;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400805
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700806 ds.fn = repo_extend_abbrev_len;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400807 ds.always_call_fn = 1;
808 ds.cb_data = (void *)&mad;
809
810 find_short_object_filename(&ds);
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400811 (void)finish_object_disambiguation(&ds, &oid_ret);
812
813 hex[mad.cur_len] = 0;
814 return mad.cur_len;
Jeff Kingaf49c6d2015-09-24 17:05:45 -0400815}
816
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700817const char *repo_find_unique_abbrev(struct repository *r,
818 const struct object_id *oid,
819 int len)
Jeff Kingaf49c6d2015-09-24 17:05:45 -0400820{
Jeff Kingef2ed502016-10-20 02:19:19 -0400821 static int bufno;
brian m. carlsondc015052017-03-26 16:01:24 +0000822 static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
René Scharfe3e989192016-11-01 09:49:07 +0100823 char *hex = hexbuffer[bufno];
824 bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700825 repo_find_unique_abbrev_r(r, hex, oid, len);
Junio C Hamanob66fde92008-03-01 23:35:32 -0800826 return hex;
Junio C Hamano9938af62005-08-03 22:15:49 -0700827}
828
Junio C Hamano6677c462005-12-15 12:54:00 -0800829static int ambiguous_path(const char *path, int len)
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700830{
831 int slash = 1;
Junio C Hamano6677c462005-12-15 12:54:00 -0800832 int cnt;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700833
Junio C Hamano6677c462005-12-15 12:54:00 -0800834 for (cnt = 0; cnt < len; cnt++) {
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700835 switch (*path++) {
836 case '\0':
837 break;
838 case '/':
839 if (slash)
840 break;
841 slash = 1;
842 continue;
843 case '.':
844 continue;
845 default:
846 slash = 0;
847 continue;
848 }
Junio C Hamanoc054d642005-12-17 00:00:50 -0800849 break;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700850 }
Junio C Hamano6677c462005-12-15 12:54:00 -0800851 return slash;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700852}
853
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400854static inline int at_mark(const char *string, int len,
855 const char **suffix, int nr)
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800856{
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800857 int i;
858
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400859 for (i = 0; i < nr; i++) {
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800860 int suffix_len = strlen(suffix[i]);
861 if (suffix_len <= len
Ævar Arnfjörð Bjarmason244ea1b2017-03-27 11:16:55 +0000862 && !strncasecmp(string, suffix[i], suffix_len))
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800863 return suffix_len;
864 }
865 return 0;
866}
867
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400868static inline int upstream_mark(const char *string, int len)
869{
870 const char *suffix[] = { "@{upstream}", "@{u}" };
871 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
872}
873
Jeff Kingadfe5d02015-05-21 00:45:47 -0400874static inline int push_mark(const char *string, int len)
875{
876 const char *suffix[] = { "@{push}" };
877 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
878}
879
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700880static 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 +0700881static int interpret_nth_prior_checkout(struct repository *r, const char *name, int namelen, struct strbuf *buf);
Thomas Rastd18ba222009-01-17 17:09:55 +0100882
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700883static int get_oid_basic(struct repository *r, const char *str, int len,
884 struct object_id *oid, unsigned int flags)
Junio C Hamanoe86eb662007-01-19 01:15:15 -0800885{
Jon Seymoureedce782010-08-24 14:52:43 +1000886 static const char *warn_msg = "refname '%.*s' is ambiguous.";
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700887 static const char *object_name_msg = N_(
888 "Git normally never creates a ref that ends with 40 hex characters\n"
889 "because it will be ignored when you just specify 40-hex. These refs\n"
890 "may be created by mistake. For example,\n"
891 "\n"
Nguyễn Thái Ngọc Duy328c6cb2019-03-29 17:39:19 +0700892 " git switch -c $br $(git rev-parse ...)\n"
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700893 "\n"
894 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
895 "examine these refs and maybe delete them. Turn this message off by\n"
Thomas Rast8dc84fd2013-07-31 22:23:31 +0200896 "running \"git config advice.objectNameWarning false\"");
brian m. carlsone82caf32017-07-13 23:49:28 +0000897 struct object_id tmp_oid;
Linus Torvaldsed378ec2006-09-11 20:17:35 -0700898 char *real_ref = NULL;
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700899 int refs_found = 0;
Felipe Contreras128fd542013-05-07 16:55:10 -0500900 int at, reflog_len, nth_prior = 0;
Junio C Hamano9938af62005-08-03 22:15:49 -0700901
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700902 if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {
Brodie Rao832cf742014-01-06 19:32:01 -0800903 if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
Jonathan Tanf24c30e2020-09-01 15:28:09 -0700904 refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0);
Brodie Rao832cf742014-01-06 19:32:01 -0800905 if (refs_found > 0) {
Jeff King25fba782013-07-12 02:20:05 -0400906 warning(warn_msg, len, str);
Ben Boeckeled9bff02021-08-23 12:44:00 +0200907 if (advice_enabled(ADVICE_OBJECT_NAME_WARNING))
Jeff King25fba782013-07-12 02:20:05 -0400908 fprintf(stderr, "%s\n", _(object_name_msg));
909 }
910 free(real_ref);
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700911 }
Junio C Hamano9938af62005-08-03 22:15:49 -0700912 return 0;
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700913 }
Junio C Hamano9938af62005-08-03 22:15:49 -0700914
Thomas Rastd18ba222009-01-17 17:09:55 +0100915 /* basic@{time or number or -number} format to query ref-log */
Junio C Hamano694500e2006-10-23 21:15:34 -0700916 reflog_len = at = 0;
Johannes Schindelinf2654582009-01-28 00:07:46 +0100917 if (len && str[len-1] == '}') {
Ramkumar Ramachandrae883a052013-05-07 16:55:09 -0500918 for (at = len-4; at >= 0; at--) {
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700919 if (str[at] == '@' && str[at+1] == '{') {
Ramkumar Ramachandra83d16bc2013-05-07 16:55:11 -0500920 if (str[at+2] == '-') {
921 if (at != 0)
922 /* @{-N} not at start */
923 return -1;
Felipe Contreras128fd542013-05-07 16:55:10 -0500924 nth_prior = 1;
925 continue;
926 }
Jeff Kingadfe5d02015-05-21 00:45:47 -0400927 if (!upstream_mark(str + at, len - at) &&
928 !push_mark(str + at, len - at)) {
Johannes Schindelin28fb8432009-09-10 17:25:57 +0200929 reflog_len = (len-1) - (at+2);
930 len = at;
931 }
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700932 break;
933 }
Shawn Pearced556fae2006-05-17 05:56:09 -0400934 }
935 }
936
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700937 /* Accept only unambiguous ref paths. */
Nicolas Pitre11cf8802007-02-01 17:29:33 -0500938 if (len && ambiguous_path(str, len))
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700939 return -1;
940
Felipe Contreras128fd542013-05-07 16:55:10 -0500941 if (nth_prior) {
Thomas Rastd18ba222009-01-17 17:09:55 +0100942 struct strbuf buf = STRBUF_INIT;
Felipe Contreras128fd542013-05-07 16:55:10 -0500943 int detached;
944
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700945 if (interpret_nth_prior_checkout(r, str, len, &buf) > 0) {
946 detached = (buf.len == r->hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
Felipe Contreras128fd542013-05-07 16:55:10 -0500947 strbuf_release(&buf);
948 if (detached)
949 return 0;
Thomas Rastd18ba222009-01-17 17:09:55 +0100950 }
Felipe Contreras128fd542013-05-07 16:55:10 -0500951 }
952
953 if (!len && reflog_len)
Nicolas Pitre11cf8802007-02-01 17:29:33 -0500954 /* allow "@{...}" to mean the current branch reflog */
Jonathan Tanf24c30e2020-09-01 15:28:09 -0700955 refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref, 0);
Felipe Contreras128fd542013-05-07 16:55:10 -0500956 else if (reflog_len)
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700957 refs_found = repo_dwim_log(r, str, len, oid, &real_ref);
Nicolas Pitref2eba662007-02-03 21:49:16 -0500958 else
Jonathan Tanf24c30e2020-09-01 15:28:09 -0700959 refs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0);
Shawn Pearced556fae2006-05-17 05:56:09 -0400960
961 if (!refs_found)
962 return -1;
963
brian m. carlson321c89b2017-07-13 23:49:29 +0000964 if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700965 (refs_found > 1 ||
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700966 !get_short_oid(r, str, len, &tmp_oid, GET_OID_QUIETLY)))
Jon Seymoureedce782010-08-24 14:52:43 +1000967 warning(warn_msg, len, str);
Shawn Pearced556fae2006-05-17 05:56:09 -0400968
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700969 if (reflog_len) {
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700970 int nth, i;
Johannes Schindelindddbad72017-04-26 21:29:31 +0200971 timestamp_t at_time;
972 timestamp_t co_time;
Junio C Hamano16d7cc92007-01-19 01:19:05 -0800973 int co_tz, co_cnt;
974
Nicolas Pitrefe558512007-02-01 12:33:23 -0500975 /* Is it asking for N-th entry, or approxidate? */
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700976 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
977 char ch = str[at+2+i];
978 if ('0' <= ch && ch <= '9')
979 nth = nth * 10 + ch - '0';
980 else
981 nth = -1;
982 }
Shawn O. Pearceea360dd2008-08-21 08:40:44 -0700983 if (100000000 <= nth) {
984 at_time = nth;
985 nth = -1;
986 } else if (0 <= nth)
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700987 at_time = 0;
Jeff King861f00e2008-04-30 00:13:58 -0400988 else {
Junio C Hamano93cfa7c2010-01-26 11:58:00 -0800989 int errors = 0;
Jeff King861f00e2008-04-30 00:13:58 -0400990 char *tmp = xstrndup(str + at + 2, reflog_len);
Junio C Hamano93cfa7c2010-01-26 11:58:00 -0800991 at_time = approxidate_careful(tmp, &errors);
Jeff King861f00e2008-04-30 00:13:58 -0400992 free(tmp);
Jeff King28b35632014-07-24 00:41:11 -0400993 if (errors) {
994 free(real_ref);
Junio C Hamanoa5e10ac2010-01-27 10:53:09 -0800995 return -1;
Jeff King28b35632014-07-24 00:41:11 -0400996 }
Jeff King861f00e2008-04-30 00:13:58 -0400997 }
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700998 if (read_ref_at(get_main_ref_store(r),
Nguyễn Thái Ngọc Duy7fdff472019-04-06 18:34:30 +0700999 real_ref, flags, at_time, nth, oid, NULL,
Junio C Hamano16d7cc92007-01-19 01:19:05 -08001000 &co_time, &co_tz, &co_cnt)) {
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +05301001 if (!len) {
Junio C Hamano145136a2020-01-30 11:35:46 -08001002 if (!skip_prefix(real_ref, "refs/heads/", &str))
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +05301003 str = "HEAD";
Junio C Hamano145136a2020-01-30 11:35:46 -08001004 len = strlen(str);
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +05301005 }
David Aguilarc41a87d2014-09-18 20:45:37 -07001006 if (at_time) {
brian m. carlson321c89b2017-07-13 23:49:29 +00001007 if (!(flags & GET_OID_QUIETLY)) {
Jeff Kingb0418302020-01-24 19:13:01 -05001008 warning(_("log for '%.*s' only goes back to %s"),
1009 len, str,
Jeff Kinga5481a62015-06-25 12:55:02 -04001010 show_date(co_time, co_tz, DATE_MODE(RFC2822)));
David Aguilarc41a87d2014-09-18 20:45:37 -07001011 }
1012 } else {
brian m. carlson321c89b2017-07-13 23:49:29 +00001013 if (flags & GET_OID_QUIETLY) {
David Aguilarc41a87d2014-09-18 20:45:37 -07001014 exit(128);
1015 }
Jeff Kingb0418302020-01-24 19:13:01 -05001016 die(_("log for '%.*s' only has %d entries"),
Jon Seymoure6eedc32010-08-24 14:52:42 +10001017 len, str, co_cnt);
1018 }
Junio C Hamano16d7cc92007-01-19 01:19:05 -08001019 }
Shawn Pearced556fae2006-05-17 05:56:09 -04001020 }
1021
Linus Torvaldsed378ec2006-09-11 20:17:35 -07001022 free(real_ref);
Shawn Pearced556fae2006-05-17 05:56:09 -04001023 return 0;
Junio C Hamano9938af62005-08-03 22:15:49 -07001024}
1025
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001026static enum get_oid_result get_parent(struct repository *r,
1027 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -05001028 struct object_id *result, int idx)
Junio C Hamano9938af62005-08-03 22:15:49 -07001029{
brian m. carlson1e43ed92017-05-06 22:10:09 +00001030 struct object_id oid;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001031 enum get_oid_result ret = get_oid_1(r, name, len, &oid,
David Turnerd1dd94b2019-01-17 23:19:43 -05001032 GET_OID_COMMITTISH);
Junio C Hamano9938af62005-08-03 22:15:49 -07001033 struct commit *commit;
1034 struct commit_list *p;
1035
1036 if (ret)
1037 return ret;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001038 commit = lookup_commit_reference(r, &oid);
Junio C Hamano9938af62005-08-03 22:15:49 -07001039 if (parse_commit(commit))
David Turnerd1dd94b2019-01-17 23:19:43 -05001040 return MISSING_OBJECT;
Junio C Hamano9938af62005-08-03 22:15:49 -07001041 if (!idx) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001042 oidcpy(result, &commit->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -05001043 return FOUND;
Junio C Hamano9938af62005-08-03 22:15:49 -07001044 }
1045 p = commit->parents;
1046 while (p) {
1047 if (!--idx) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001048 oidcpy(result, &p->item->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -05001049 return FOUND;
Junio C Hamano9938af62005-08-03 22:15:49 -07001050 }
1051 p = p->next;
1052 }
David Turnerd1dd94b2019-01-17 23:19:43 -05001053 return MISSING_OBJECT;
Junio C Hamano9938af62005-08-03 22:15:49 -07001054}
1055
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001056static enum get_oid_result get_nth_ancestor(struct repository *r,
1057 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -05001058 struct object_id *result,
1059 int generation)
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001060{
brian m. carlson1e43ed92017-05-06 22:10:09 +00001061 struct object_id oid;
Linus Torvalds621ff672008-03-14 11:49:40 -07001062 struct commit *commit;
1063 int ret;
1064
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001065 ret = get_oid_1(r, name, len, &oid, GET_OID_COMMITTISH);
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001066 if (ret)
1067 return ret;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001068 commit = lookup_commit_reference(r, &oid);
Linus Torvalds621ff672008-03-14 11:49:40 -07001069 if (!commit)
David Turnerd1dd94b2019-01-17 23:19:43 -05001070 return MISSING_OBJECT;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001071
1072 while (generation--) {
Linus Torvalds621ff672008-03-14 11:49:40 -07001073 if (parse_commit(commit) || !commit->parents)
David Turnerd1dd94b2019-01-17 23:19:43 -05001074 return MISSING_OBJECT;
Linus Torvalds621ff672008-03-14 11:49:40 -07001075 commit = commit->parents->item;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001076 }
brian m. carlsone82caf32017-07-13 23:49:28 +00001077 oidcpy(result, &commit->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -05001078 return FOUND;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001079}
1080
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001081struct object *repo_peel_to_type(struct repository *r, const char *name, int namelen,
1082 struct object *o, enum object_type expected_type)
Junio C Hamano81776312007-12-24 00:51:01 -08001083{
1084 if (name && !namelen)
1085 namelen = strlen(name);
Junio C Hamano81776312007-12-24 00:51:01 -08001086 while (1) {
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001087 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
Junio C Hamano81776312007-12-24 00:51:01 -08001088 return NULL;
Junio C Hamanoa6a3f2c2013-03-31 15:24:12 -07001089 if (expected_type == OBJ_ANY || o->type == expected_type)
Junio C Hamano81776312007-12-24 00:51:01 -08001090 return o;
1091 if (o->type == OBJ_TAG)
1092 o = ((struct tag*) o)->tagged;
1093 else if (o->type == OBJ_COMMIT)
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001094 o = &(repo_get_commit_tree(r, ((struct commit *)o))->object);
Junio C Hamano81776312007-12-24 00:51:01 -08001095 else {
1096 if (name)
1097 error("%.*s: expected %s type, but the object "
1098 "dereferences to %s type",
Brandon Williamsdebca9d2018-02-14 10:59:24 -08001099 namelen, name, type_name(expected_type),
1100 type_name(o->type));
Junio C Hamano81776312007-12-24 00:51:01 -08001101 return NULL;
1102 }
1103 }
1104}
1105
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001106static int peel_onion(struct repository *r, const char *name, int len,
1107 struct object_id *oid, unsigned lookup_flags)
Junio C Hamano5385f522005-10-13 18:57:40 -07001108{
brian m. carlsonde37d502017-05-06 22:10:29 +00001109 struct object_id outer;
Junio C Hamano5385f522005-10-13 18:57:40 -07001110 const char *sp;
Linus Torvalds885a86a2006-06-14 16:45:13 -07001111 unsigned int expected_type = 0;
Junio C Hamano5385f522005-10-13 18:57:40 -07001112 struct object *o;
1113
1114 /*
1115 * "ref^{type}" dereferences ref repeatedly until you cannot
1116 * dereference anymore, or you get an object of given type,
1117 * whichever comes first. "ref^{}" means just dereference
1118 * tags until you get a non-tag. "ref^0" is a shorthand for
1119 * "ref^{commit}". "commit^{tree}" could be used to find the
1120 * top-level tree of the given commit.
1121 */
1122 if (len < 4 || name[len-1] != '}')
1123 return -1;
1124
1125 for (sp = name + len - 1; name <= sp; sp--) {
1126 int ch = *sp;
1127 if (ch == '{' && name < sp && sp[-1] == '^')
1128 break;
1129 }
1130 if (sp <= name)
1131 return -1;
1132
1133 sp++; /* beginning of type name, or closing brace for empty */
Christian Couder59556542013-11-30 21:55:40 +01001134 if (starts_with(sp, "commit}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001135 expected_type = OBJ_COMMIT;
Christian Couder59556542013-11-30 21:55:40 +01001136 else if (starts_with(sp, "tag}"))
Richard Hansen75aa26d2013-09-03 15:50:16 -04001137 expected_type = OBJ_TAG;
Christian Couder59556542013-11-30 21:55:40 +01001138 else if (starts_with(sp, "tree}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001139 expected_type = OBJ_TREE;
Christian Couder59556542013-11-30 21:55:40 +01001140 else if (starts_with(sp, "blob}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001141 expected_type = OBJ_BLOB;
Christian Couder59556542013-11-30 21:55:40 +01001142 else if (starts_with(sp, "object}"))
Junio C Hamanoa6a3f2c2013-03-31 15:24:12 -07001143 expected_type = OBJ_ANY;
Junio C Hamano5385f522005-10-13 18:57:40 -07001144 else if (sp[0] == '}')
Linus Torvalds19746322006-07-11 20:45:31 -07001145 expected_type = OBJ_NONE;
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001146 else if (sp[0] == '/')
1147 expected_type = OBJ_COMMIT;
Junio C Hamano5385f522005-10-13 18:57:40 -07001148 else
1149 return -1;
1150
brian m. carlson321c89b2017-07-13 23:49:29 +00001151 lookup_flags &= ~GET_OID_DISAMBIGUATORS;
Junio C Hamanoe2643612012-07-02 10:00:40 -07001152 if (expected_type == OBJ_COMMIT)
brian m. carlson321c89b2017-07-13 23:49:29 +00001153 lookup_flags |= GET_OID_COMMITTISH;
Junio C Hamanoed1ca602013-03-31 15:19:52 -07001154 else if (expected_type == OBJ_TREE)
brian m. carlson321c89b2017-07-13 23:49:29 +00001155 lookup_flags |= GET_OID_TREEISH;
Junio C Hamanoe2643612012-07-02 10:00:40 -07001156
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001157 if (get_oid_1(r, name, sp - name - 2, &outer, lookup_flags))
Junio C Hamano5385f522005-10-13 18:57:40 -07001158 return -1;
1159
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001160 o = parse_object(r, &outer);
Junio C Hamano5385f522005-10-13 18:57:40 -07001161 if (!o)
1162 return -1;
Linus Torvalds885a86a2006-06-14 16:45:13 -07001163 if (!expected_type) {
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001164 o = deref_tag(r, o, name, sp - name - 2);
1165 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
Junio C Hamano6e1c6c12005-10-19 22:48:16 -07001166 return -1;
brian m. carlsone82caf32017-07-13 23:49:28 +00001167 oidcpy(oid, &o->oid);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001168 return 0;
Junio C Hamano5385f522005-10-13 18:57:40 -07001169 }
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001170
1171 /*
1172 * At this point, the syntax look correct, so
1173 * if we do not get the needed object, we should
1174 * barf.
1175 */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001176 o = repo_peel_to_type(r, name, len, o, expected_type);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001177 if (!o)
Junio C Hamano81776312007-12-24 00:51:01 -08001178 return -1;
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001179
brian m. carlsone82caf32017-07-13 23:49:28 +00001180 oidcpy(oid, &o->oid);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001181 if (sp[0] == '/') {
1182 /* "$commit^{/foo}" */
1183 char *prefix;
1184 int ret;
1185 struct commit_list *list = NULL;
1186
Nguyễn Thái Ngọc Duy43228422010-12-15 16:02:54 +07001187 /*
1188 * $commit^{/}. Some regex implementation may reject.
1189 * We don't need regex anyway. '' pattern always matches.
1190 */
1191 if (sp[1] == '}')
1192 return 0;
1193
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001194 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
1195 commit_list_insert((struct commit *)o, &list);
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001196 ret = get_oid_oneline(r, prefix, oid, list);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001197 free(prefix);
1198 return ret;
Junio C Hamano5385f522005-10-13 18:57:40 -07001199 }
1200 return 0;
1201}
1202
Nguyễn Thái Ngọc Duy0c6b5ba2019-04-16 16:33:30 +07001203static int get_describe_name(struct repository *r,
1204 const char *name, int len,
1205 struct object_id *oid)
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001206{
1207 const char *cp;
brian m. carlson321c89b2017-07-13 23:49:29 +00001208 unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001209
1210 for (cp = name + len - 1; name + 2 <= cp; cp--) {
1211 char ch = *cp;
René Scharfe6f75d452015-03-09 23:46:54 +01001212 if (!isxdigit(ch)) {
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001213 /* We must be looking at g in "SOMETHING-g"
1214 * for it to be describe output.
1215 */
1216 if (ch == 'g' && cp[-1] == '-') {
1217 cp++;
1218 len -= cp - name;
Nguyễn Thái Ngọc Duy0c6b5ba2019-04-16 16:33:30 +07001219 return get_short_oid(r,
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +07001220 cp, len, oid, flags);
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001221 }
1222 }
1223 }
1224 return -1;
1225}
1226
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001227static enum get_oid_result get_oid_1(struct repository *r,
1228 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -05001229 struct object_id *oid,
1230 unsigned lookup_flags)
Junio C Hamano9938af62005-08-03 22:15:49 -07001231{
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001232 int ret, has_suffix;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001233 const char *cp;
Junio C Hamano9938af62005-08-03 22:15:49 -07001234
Linus Torvalds621ff672008-03-14 11:49:40 -07001235 /*
1236 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001237 */
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001238 has_suffix = 0;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001239 for (cp = name + len - 1; name <= cp; cp--) {
1240 int ch = *cp;
1241 if ('0' <= ch && ch <= '9')
1242 continue;
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001243 if (ch == '~' || ch == '^')
1244 has_suffix = ch;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001245 break;
1246 }
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001247
1248 if (has_suffix) {
René Scharfe59fa5f52019-09-15 14:10:28 +02001249 unsigned int num = 0;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001250 int len1 = cp - name;
1251 cp++;
René Scharfe59fa5f52019-09-15 14:10:28 +02001252 while (cp < name + len) {
1253 unsigned int digit = *cp++ - '0';
1254 if (unsigned_mult_overflows(num, 10))
1255 return MISSING_OBJECT;
1256 num *= 10;
1257 if (unsigned_add_overflows(num, digit))
1258 return MISSING_OBJECT;
1259 num += digit;
1260 }
Linus Torvalds621ff672008-03-14 11:49:40 -07001261 if (!num && len1 == len - 1)
1262 num = 1;
René Scharfe59fa5f52019-09-15 14:10:28 +02001263 else if (num > INT_MAX)
1264 return MISSING_OBJECT;
Linus Torvalds621ff672008-03-14 11:49:40 -07001265 if (has_suffix == '^')
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001266 return get_parent(r, name, len1, oid, num);
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001267 /* else if (has_suffix == '~') -- goes without saying */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001268 return get_nth_ancestor(r, name, len1, oid, num);
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001269 }
1270
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001271 ret = peel_onion(r, name, len, oid, lookup_flags);
Junio C Hamano5385f522005-10-13 18:57:40 -07001272 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001273 return FOUND;
Junio C Hamano5385f522005-10-13 18:57:40 -07001274
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001275 ret = get_oid_basic(r, name, len, oid, lookup_flags);
Junio C Hamano9938af62005-08-03 22:15:49 -07001276 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001277 return FOUND;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001278
1279 /* It could be describe output that is "SOMETHING-gXXXX" */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001280 ret = get_describe_name(r, name, len, oid);
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001281 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001282 return FOUND;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001283
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001284 return get_short_oid(r, name, len, oid, lookup_flags);
Junio C Hamano9938af62005-08-03 22:15:49 -07001285}
1286
Junio C Hamanof7bff002010-08-02 14:37:06 -07001287/*
1288 * This interprets names like ':/Initial revision of "git"' by searching
1289 * through history and returning the first commit whose message starts
Junio C Hamano3d045892010-08-12 18:32:49 -07001290 * the given regular expression.
Junio C Hamanof7bff002010-08-02 14:37:06 -07001291 *
Will Palmer07698542016-01-30 17:06:01 -07001292 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1293 *
1294 * For a literal '!' character at the beginning of a pattern, you have to repeat
1295 * that, like: ':/!!foo'
1296 *
1297 * For future extension, all other sequences beginning with ':/!' are reserved.
Junio C Hamanof7bff002010-08-02 14:37:06 -07001298 */
Nguyễn Thái Ngọc Duy208acbf2014-03-25 20:23:26 +07001299
1300/* Remember to update object flag allocation in object.h */
Junio C Hamanof7bff002010-08-02 14:37:06 -07001301#define ONELINE_SEEN (1u<<20)
1302
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001303struct handle_one_ref_cb {
1304 struct repository *repo;
1305 struct commit_list **list;
1306};
1307
Michael Haggerty9c5fe0b2015-05-25 18:39:05 +00001308static int handle_one_ref(const char *path, const struct object_id *oid,
Ævar Arnfjörð Bjarmason5cf88fd2022-08-25 19:09:48 +02001309 int flag UNUSED,
Jeff King63e14ee2022-08-19 06:08:32 -04001310 void *cb_data)
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001311{
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001312 struct handle_one_ref_cb *cb = cb_data;
1313 struct commit_list **list = cb->list;
1314 struct object *object = parse_object(cb->repo, oid);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001315 if (!object)
1316 return 0;
Martin Koegleraffeef12008-02-18 08:31:54 +01001317 if (object->type == OBJ_TAG) {
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001318 object = deref_tag(cb->repo, object, path,
Stefan Bellera74093d2018-06-28 18:22:05 -07001319 strlen(path));
Martin Koegleraffeef12008-02-18 08:31:54 +01001320 if (!object)
1321 return 0;
1322 }
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001323 if (object->type != OBJ_COMMIT)
1324 return 0;
René Scharfee8d1dfe2014-08-21 20:30:29 +02001325 commit_list_insert((struct commit *)object, list);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001326 return 0;
1327}
1328
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001329static int get_oid_oneline(struct repository *r,
1330 const char *prefix, struct object_id *oid,
1331 struct commit_list *list)
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001332{
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001333 struct commit_list *backup = NULL, *l;
Junio C Hamano28042db2010-12-12 22:19:00 -08001334 int found = 0;
Will Palmer07698542016-01-30 17:06:01 -07001335 int negative = 0;
Linus Torvalds57895102010-04-23 08:20:20 -07001336 regex_t regex;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001337
1338 if (prefix[0] == '!') {
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001339 prefix++;
Will Palmer07698542016-01-30 17:06:01 -07001340
1341 if (prefix[0] == '-') {
1342 prefix++;
1343 negative = 1;
1344 } else if (prefix[0] != '!') {
Junio C Hamanoe6a6a762016-02-24 13:25:52 -08001345 return -1;
Will Palmer07698542016-01-30 17:06:01 -07001346 }
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001347 }
Linus Torvalds57895102010-04-23 08:20:20 -07001348
1349 if (regcomp(&regex, prefix, REG_EXTENDED))
Jeff Kingaac4fac2016-02-10 16:19:25 -05001350 return -1;
Linus Torvalds57895102010-04-23 08:20:20 -07001351
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001352 for (l = list; l; l = l->next) {
1353 l->item->object.flags |= ONELINE_SEEN;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001354 commit_list_insert(l->item, &backup);
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001355 }
Jim Meyeringed8ad7e2007-03-11 19:49:08 +01001356 while (list) {
Jeff Kingba41c1c2014-06-10 17:41:02 -04001357 const char *p, *buf;
Linus Torvalds1358e7d2007-03-12 11:30:38 -07001358 struct commit *commit;
Junio C Hamano28042db2010-12-12 22:19:00 -08001359 int matches;
Jim Meyeringed8ad7e2007-03-11 19:49:08 +01001360
1361 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001362 if (!parse_object(r, &commit->object.oid))
Martin Koegler283cdbc2008-02-18 21:47:53 +01001363 continue;
Jeff King8597ea32014-06-10 17:44:13 -04001364 buf = get_commit_buffer(commit, NULL);
Jeff Kingba41c1c2014-06-10 17:41:02 -04001365 p = strstr(buf, "\n\n");
Will Palmer07698542016-01-30 17:06:01 -07001366 matches = negative ^ (p && !regexec(&regex, p + 2, 0, NULL, 0));
Jeff Kingba41c1c2014-06-10 17:41:02 -04001367 unuse_commit_buffer(commit, buf);
Junio C Hamano28042db2010-12-12 22:19:00 -08001368
1369 if (matches) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001370 oidcpy(oid, &commit->object.oid);
Junio C Hamano28042db2010-12-12 22:19:00 -08001371 found = 1;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001372 break;
1373 }
1374 }
Linus Torvalds57895102010-04-23 08:20:20 -07001375 regfree(&regex);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001376 free_commit_list(list);
1377 for (l = backup; l; l = l->next)
1378 clear_commit_marks(l->item, ONELINE_SEEN);
Junio C Hamano28042db2010-12-12 22:19:00 -08001379 free_commit_list(backup);
1380 return found ? 0 : -1;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001381}
1382
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001383struct grab_nth_branch_switch_cbdata {
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001384 int remaining;
René Scharfe4b3aa172019-09-18 18:35:38 +02001385 struct strbuf *sb;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001386};
1387
Ævar Arnfjörð Bjarmason5cf88fd2022-08-25 19:09:48 +02001388static int grab_nth_branch_switch(struct object_id *ooid UNUSED,
1389 struct object_id *noid UNUSED,
1390 const char *email UNUSED,
1391 timestamp_t timestamp UNUSED,
1392 int tz UNUSED,
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001393 const char *message, void *cb_data)
1394{
1395 struct grab_nth_branch_switch_cbdata *cb = cb_data;
Thomas Rasta884d0c2009-01-17 17:09:54 +01001396 const char *match = NULL, *target = NULL;
1397 size_t len;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001398
Jeff King95b567c2014-06-18 15:48:29 -04001399 if (skip_prefix(message, "checkout: moving from ", &match))
Junio C Hamanod7c03c12009-01-21 00:37:38 -08001400 target = strstr(match, " to ");
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001401
Junio C Hamanoc8297742009-01-19 16:44:08 -08001402 if (!match || !target)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001403 return 0;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001404 if (--(cb->remaining) == 0) {
1405 len = target - match;
René Scharfe4b3aa172019-09-18 18:35:38 +02001406 strbuf_reset(cb->sb);
1407 strbuf_add(cb->sb, match, len);
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001408 return 1; /* we are done */
1409 }
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001410 return 0;
1411}
1412
1413/*
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001414 * Parse @{-N} syntax, return the number of characters parsed
1415 * if successful; otherwise signal an error with negative value.
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001416 */
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001417static int interpret_nth_prior_checkout(struct repository *r,
1418 const char *name, int namelen,
Jeff King8cd42492014-01-15 03:31:57 -05001419 struct strbuf *buf)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001420{
Junio C Hamanoc2883e62009-01-19 00:04:25 -08001421 long nth;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001422 int retval;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001423 struct grab_nth_branch_switch_cbdata cb;
Thomas Rasta884d0c2009-01-17 17:09:54 +01001424 const char *brace;
1425 char *num_end;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001426
Jeff King8cd42492014-01-15 03:31:57 -05001427 if (namelen < 4)
1428 return -1;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001429 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
1430 return -1;
Jeff King8cd42492014-01-15 03:31:57 -05001431 brace = memchr(name, '}', namelen);
Thomas Rasta884d0c2009-01-17 17:09:54 +01001432 if (!brace)
1433 return -1;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001434 nth = strtol(name + 3, &num_end, 10);
Thomas Rasta884d0c2009-01-17 17:09:54 +01001435 if (num_end != brace)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001436 return -1;
Junio C Hamanoc2883e62009-01-19 00:04:25 -08001437 if (nth <= 0)
1438 return -1;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001439 cb.remaining = nth;
René Scharfe4b3aa172019-09-18 18:35:38 +02001440 cb.sb = buf;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001441
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001442 retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r),
1443 "HEAD", grab_nth_branch_switch, &cb);
1444 if (0 < retval) {
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001445 retval = brace - name + 1;
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001446 } else
1447 retval = 0;
Junio C Hamano39765e52009-01-19 21:58:31 -08001448
Junio C Hamano39765e52009-01-19 21:58:31 -08001449 return retval;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001450}
1451
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001452int repo_get_oid_mb(struct repository *r,
1453 const char *name,
1454 struct object_id *oid)
Junio C Hamano619a6442009-10-18 12:34:56 -07001455{
1456 struct commit *one, *two;
1457 struct commit_list *mbs;
brian m. carlson151b2912016-09-05 20:08:07 +00001458 struct object_id oid_tmp;
Junio C Hamano619a6442009-10-18 12:34:56 -07001459 const char *dots;
1460 int st;
1461
1462 dots = strstr(name, "...");
1463 if (!dots)
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001464 return repo_get_oid(r, name, oid);
Junio C Hamano619a6442009-10-18 12:34:56 -07001465 if (dots == name)
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001466 st = repo_get_oid(r, "HEAD", &oid_tmp);
Junio C Hamano619a6442009-10-18 12:34:56 -07001467 else {
1468 struct strbuf sb;
1469 strbuf_init(&sb, dots - name);
1470 strbuf_add(&sb, name, dots - name);
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001471 st = repo_get_oid_committish(r, sb.buf, &oid_tmp);
Junio C Hamano619a6442009-10-18 12:34:56 -07001472 strbuf_release(&sb);
1473 }
1474 if (st)
1475 return st;
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001476 one = lookup_commit_reference_gently(r, &oid_tmp, 0);
Junio C Hamano619a6442009-10-18 12:34:56 -07001477 if (!one)
1478 return -1;
1479
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001480 if (repo_get_oid_committish(r, dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
Junio C Hamano619a6442009-10-18 12:34:56 -07001481 return -1;
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001482 two = lookup_commit_reference_gently(r, &oid_tmp, 0);
Junio C Hamano619a6442009-10-18 12:34:56 -07001483 if (!two)
1484 return -1;
Nguyễn Thái Ngọc Duy34e77712019-06-27 16:28:52 +07001485 mbs = repo_get_merge_bases(r, one, two);
Junio C Hamano619a6442009-10-18 12:34:56 -07001486 if (!mbs || mbs->next)
1487 st = -1;
1488 else {
1489 st = 0;
brian m. carlson151b2912016-09-05 20:08:07 +00001490 oidcpy(oid, &mbs->item->object.oid);
Junio C Hamano619a6442009-10-18 12:34:56 -07001491 }
1492 free_commit_list(mbs);
1493 return st;
1494}
1495
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001496/* parse @something syntax, when 'something' is not {.*} */
1497static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1498{
1499 const char *next;
1500
1501 if (len || name[1] == '{')
1502 return -1;
1503
1504 /* make sure it's a single @, or @@{.*}, not @foo */
Jeff King8cd42492014-01-15 03:31:57 -05001505 next = memchr(name + len + 1, '@', namelen - len - 1);
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001506 if (next && next[1] != '{')
1507 return -1;
1508 if (!next)
1509 next = name + namelen;
1510 if (next != name + 1)
1511 return -1;
1512
1513 strbuf_reset(buf);
1514 strbuf_add(buf, "HEAD", 4);
1515 return 1;
1516}
1517
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001518static int reinterpret(struct repository *r,
1519 const char *name, int namelen, int len,
Jeff King0e9f62d2017-03-02 03:23:01 -05001520 struct strbuf *buf, unsigned allowed)
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001521{
1522 /* we have extra data, which might need further processing */
1523 struct strbuf tmp = STRBUF_INIT;
1524 int used = buf->len;
1525 int ret;
Jonathan Tana4f66a72020-09-01 15:28:07 -07001526 struct interpret_branch_name_options options = {
1527 .allowed = allowed
1528 };
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001529
1530 strbuf_add(buf, name + len, namelen - len);
Jonathan Tana4f66a72020-09-01 15:28:07 -07001531 ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, &options);
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001532 /* that data was not interpreted, remove our cruft */
1533 if (ret < 0) {
1534 strbuf_setlen(buf, used);
1535 return len;
1536 }
1537 strbuf_reset(buf);
1538 strbuf_addbuf(buf, &tmp);
1539 strbuf_release(&tmp);
1540 /* tweak for size of {-N} versus expanded ref name */
1541 return ret - used + len;
1542}
1543
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001544static void set_shortened_ref(struct repository *r, struct strbuf *buf, const char *ref)
Jeff Kinga39c14a2014-01-15 03:26:33 -05001545{
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001546 char *s = refs_shorten_unambiguous_ref(get_main_ref_store(r), ref, 0);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001547 strbuf_reset(buf);
1548 strbuf_addstr(buf, s);
1549 free(s);
1550}
1551
Jeff King0e9f62d2017-03-02 03:23:01 -05001552static int branch_interpret_allowed(const char *refname, unsigned allowed)
1553{
1554 if (!allowed)
1555 return 1;
1556
1557 if ((allowed & INTERPRET_BRANCH_LOCAL) &&
1558 starts_with(refname, "refs/heads/"))
1559 return 1;
1560 if ((allowed & INTERPRET_BRANCH_REMOTE) &&
1561 starts_with(refname, "refs/remotes/"))
1562 return 1;
1563
1564 return 0;
1565}
1566
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001567static int interpret_branch_mark(struct repository *r,
1568 const char *name, int namelen,
Jeff King48c58472015-05-21 00:45:43 -04001569 int at, struct strbuf *buf,
1570 int (*get_mark)(const char *, int),
1571 const char *(*get_data)(struct branch *,
Jeff King0e9f62d2017-03-02 03:23:01 -05001572 struct strbuf *),
Jonathan Tana4f66a72020-09-01 15:28:07 -07001573 const struct interpret_branch_name_options *options)
Jeff Kinga39c14a2014-01-15 03:26:33 -05001574{
1575 int len;
Jeff King48c58472015-05-21 00:45:43 -04001576 struct branch *branch;
1577 struct strbuf err = STRBUF_INIT;
1578 const char *value;
Jeff Kinga39c14a2014-01-15 03:26:33 -05001579
Jeff King48c58472015-05-21 00:45:43 -04001580 len = get_mark(name + at, namelen - at);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001581 if (!len)
1582 return -1;
1583
Jeff King3f6eb302014-01-15 03:37:23 -05001584 if (memchr(name, ':', at))
1585 return -1;
1586
Jeff King48c58472015-05-21 00:45:43 -04001587 if (at) {
1588 char *name_str = xmemdupz(name, at);
1589 branch = branch_get(name_str);
1590 free(name_str);
1591 } else
1592 branch = branch_get(NULL);
1593
1594 value = get_data(branch, &err);
Jonathan Tanf24c30e2020-09-01 15:28:09 -07001595 if (!value) {
1596 if (options->nonfatal_dangling_mark) {
1597 strbuf_release(&err);
1598 return -1;
1599 } else {
1600 die("%s", err.buf);
1601 }
1602 }
Jeff King48c58472015-05-21 00:45:43 -04001603
Jonathan Tana4f66a72020-09-01 15:28:07 -07001604 if (!branch_interpret_allowed(value, options->allowed))
Jeff King0e9f62d2017-03-02 03:23:01 -05001605 return -1;
1606
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001607 set_shortened_ref(r, buf, value);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001608 return len + at;
1609}
1610
Nguyễn Thái Ngọc Duy8f56e9d2019-04-06 18:34:26 +07001611int repo_interpret_branch_name(struct repository *r,
1612 const char *name, int namelen,
1613 struct strbuf *buf,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001614 const struct interpret_branch_name_options *options)
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001615{
Jeff Kingf278f402014-01-15 03:27:32 -05001616 char *at;
Jeff King9892d5d2014-01-15 03:40:46 -05001617 const char *start;
Jeff King13228c32017-02-27 04:25:40 -05001618 int len;
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001619
Felipe Contrerascf99a762013-09-02 01:34:29 -05001620 if (!namelen)
1621 namelen = strlen(name);
1622
Jonathan Tana4f66a72020-09-01 15:28:07 -07001623 if (!options->allowed || (options->allowed & INTERPRET_BRANCH_LOCAL)) {
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001624 len = interpret_nth_prior_checkout(r, name, namelen, buf);
Jeff King0e9f62d2017-03-02 03:23:01 -05001625 if (!len) {
1626 return len; /* syntax Ok, not enough switches */
1627 } else if (len > 0) {
1628 if (len == namelen)
1629 return len; /* consumed all */
1630 else
Jonathan Tana4f66a72020-09-01 15:28:07 -07001631 return reinterpret(r, name, namelen, len, buf,
1632 options->allowed);
Jeff King0e9f62d2017-03-02 03:23:01 -05001633 }
Jeff Kingd46a8302010-01-28 04:52:22 -05001634 }
1635
Jeff King9892d5d2014-01-15 03:40:46 -05001636 for (start = name;
1637 (at = memchr(start, '@', namelen - (start - name)));
1638 start = at + 1) {
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001639
Jonathan Tana4f66a72020-09-01 15:28:07 -07001640 if (!options->allowed || (options->allowed & INTERPRET_BRANCH_HEAD)) {
Jeff King0e9f62d2017-03-02 03:23:01 -05001641 len = interpret_empty_at(name, namelen, at - name, buf);
1642 if (len > 0)
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001643 return reinterpret(r, name, namelen, len, buf,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001644 options->allowed);
Jeff King0e9f62d2017-03-02 03:23:01 -05001645 }
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001646
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001647 len = interpret_branch_mark(r, name, namelen, at - name, buf,
Jeff King0e9f62d2017-03-02 03:23:01 -05001648 upstream_mark, branch_get_upstream,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001649 options);
Jeff King9892d5d2014-01-15 03:40:46 -05001650 if (len > 0)
1651 return len;
Jeff Kingadfe5d02015-05-21 00:45:47 -04001652
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001653 len = interpret_branch_mark(r, name, namelen, at - name, buf,
Jeff King0e9f62d2017-03-02 03:23:01 -05001654 push_mark, branch_get_push,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001655 options);
Zbigniew Jędrzejewski-Szmek64720282012-04-14 09:54:35 +02001656 if (len > 0)
Zbigniew Jędrzejewski-Szmek17c82212012-04-14 09:54:34 +02001657 return len;
Zbigniew Jędrzejewski-Szmekbb0dab52012-04-14 09:54:33 +02001658 }
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001659
Jeff Kinga39c14a2014-01-15 03:26:33 -05001660 return -1;
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001661}
1662
Jeff King0e9f62d2017-03-02 03:23:01 -05001663void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001664{
1665 int len = strlen(name);
Jonathan Tana4f66a72020-09-01 15:28:07 -07001666 struct interpret_branch_name_options options = {
1667 .allowed = allowed
1668 };
1669 int used = interpret_branch_name(name, len, sb, &options);
Junio C Hamano84cf2462013-05-15 14:32:30 -07001670
Junio C Hamano84cf2462013-05-15 14:32:30 -07001671 if (used < 0)
1672 used = 0;
1673 strbuf_add(sb, name + used, len - used);
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001674}
1675
1676int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1677{
Junio C Hamano7c3f8472017-10-17 00:08:08 -07001678 if (startup_info->have_repository)
1679 strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
1680 else
1681 strbuf_addstr(sb, name);
Junio C Hamanoa625b092017-11-14 17:12:58 +05301682
1683 /*
1684 * This splice must be done even if we end up rejecting the
1685 * name; builtin/branch.c::copy_or_rename_branch() still wants
1686 * to see what the name expanded to so that "branch -m" can be
1687 * used as a tool to correct earlier mistakes.
1688 */
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001689 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
Junio C Hamanoa625b092017-11-14 17:12:58 +05301690
1691 if (*name == '-' ||
1692 !strcmp(sb->buf, "refs/heads/HEAD"))
1693 return -1;
1694
Michael Haggerty8d9c5012011-09-15 23:10:25 +02001695 return check_refname_format(sb->buf, 0);
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001696}
1697
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001698/*
brian m. carlsone82caf32017-07-13 23:49:28 +00001699 * This is like "get_oid_basic()", except it allows "object ID expressions",
Junio C Hamano9938af62005-08-03 22:15:49 -07001700 * notably "xyz^" for "parent of xyz"
1701 */
Nguyễn Thái Ngọc Duyec580ea2019-04-16 16:33:37 +07001702int repo_get_oid(struct repository *r, const char *name, struct object_id *oid)
brian m. carlson2764fd92016-04-17 23:10:36 +00001703{
brian m. carlsone82caf32017-07-13 23:49:28 +00001704 struct object_context unused;
Nguyễn Thái Ngọc Duyec580ea2019-04-16 16:33:37 +07001705 return get_oid_with_context(r, name, 0, oid, &unused);
brian m. carlson2764fd92016-04-17 23:10:36 +00001706}
1707
Paul-Sebastian Ungureanuf5116f42019-02-25 23:16:05 +00001708/*
1709 * This returns a non-zero value if the string (built using printf
1710 * format and the given arguments) is not a valid object.
1711 */
1712int get_oidf(struct object_id *oid, const char *fmt, ...)
1713{
1714 va_list ap;
1715 int ret;
1716 struct strbuf sb = STRBUF_INIT;
1717
1718 va_start(ap, fmt);
1719 strbuf_vaddf(&sb, fmt, ap);
1720 va_end(ap);
1721
1722 ret = get_oid(sb.buf, oid);
1723 strbuf_release(&sb);
1724
1725 return ret;
1726}
brian m. carlson2764fd92016-04-17 23:10:36 +00001727
1728/*
Richard Hansena8a54062013-09-04 15:04:31 -04001729 * Many callers know that the user meant to name a commit-ish by
Junio C Hamanocd74e472012-07-02 12:04:52 -07001730 * syntactical positions where the object name appears. Calling this
1731 * function allows the machinery to disambiguate shorter-than-unique
Richard Hansena8a54062013-09-04 15:04:31 -04001732 * abbreviated object names between commit-ish and others.
Junio C Hamanocd74e472012-07-02 12:04:52 -07001733 *
1734 * Note that this does NOT error out when the named object is not a
Richard Hansena8a54062013-09-04 15:04:31 -04001735 * commit-ish. It is merely to give a hint to the disambiguation
Junio C Hamanocd74e472012-07-02 12:04:52 -07001736 * machinery.
1737 */
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001738int repo_get_oid_committish(struct repository *r,
1739 const char *name,
1740 struct object_id *oid)
Junio C Hamanocd74e472012-07-02 12:04:52 -07001741{
1742 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001743 return get_oid_with_context(r, name, GET_OID_COMMITTISH,
brian m. carlsone82caf32017-07-13 23:49:28 +00001744 oid, &unused);
Junio C Hamanocd74e472012-07-02 12:04:52 -07001745}
1746
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001747int repo_get_oid_treeish(struct repository *r,
1748 const char *name,
1749 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001750{
1751 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001752 return get_oid_with_context(r, name, GET_OID_TREEISH,
brian m. carlsone82caf32017-07-13 23:49:28 +00001753 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001754}
1755
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001756int repo_get_oid_commit(struct repository *r,
1757 const char *name,
1758 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001759{
1760 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001761 return get_oid_with_context(r, name, GET_OID_COMMIT,
brian m. carlsone82caf32017-07-13 23:49:28 +00001762 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001763}
1764
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001765int repo_get_oid_tree(struct repository *r,
1766 const char *name,
1767 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001768{
1769 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001770 return get_oid_with_context(r, name, GET_OID_TREE,
brian m. carlsone82caf32017-07-13 23:49:28 +00001771 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001772}
1773
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001774int repo_get_oid_blob(struct repository *r,
1775 const char *name,
1776 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001777{
1778 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001779 return get_oid_with_context(r, name, GET_OID_BLOB,
brian m. carlsone82caf32017-07-13 23:49:28 +00001780 oid, &unused);
Martin Koeglera0cd87a2007-04-23 22:55:05 +02001781}
1782
Matthieu Moy009fee42009-12-07 11:10:50 +01001783/* Must be called only when object_name:filename doesn't exist. */
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001784static void diagnose_invalid_oid_path(struct repository *r,
1785 const char *prefix,
brian m. carlsone82caf32017-07-13 23:49:28 +00001786 const char *filename,
1787 const struct object_id *tree_oid,
1788 const char *object_name,
1789 int object_name_len)
Matthieu Moy009fee42009-12-07 11:10:50 +01001790{
brian m. carlsone82caf32017-07-13 23:49:28 +00001791 struct object_id oid;
Elijah Newren5ec1e722019-04-05 08:00:12 -07001792 unsigned short mode;
Matthieu Moy009fee42009-12-07 11:10:50 +01001793
1794 if (!prefix)
1795 prefix = "";
1796
René Scharfedbe44fa2015-05-19 23:44:23 +02001797 if (file_exists(filename))
Jeff Kingb0418302020-01-24 19:13:01 -05001798 die(_("path '%s' exists on disk, but not in '%.*s'"),
René Scharfeb2981d02013-03-16 19:29:31 +01001799 filename, object_name_len, object_name);
Junio C Hamanoc7054202017-05-30 09:23:33 +09001800 if (is_missing_file_error(errno)) {
Jeff Kingb2724c82014-06-19 17:26:56 -04001801 char *fullname = xstrfmt("%s%s", prefix, filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01001802
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001803 if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
Jeff Kingb0418302020-01-24 19:13:01 -05001804 die(_("path '%s' exists, but not '%s'\n"
1805 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
Matthieu Moy009fee42009-12-07 11:10:50 +01001806 fullname,
1807 filename,
René Scharfeb2981d02013-03-16 19:29:31 +01001808 object_name_len, object_name,
Michael J Grubere41d7182011-03-31 11:17:34 +02001809 fullname,
René Scharfeb2981d02013-03-16 19:29:31 +01001810 object_name_len, object_name,
Michael J Grubere41d7182011-03-31 11:17:34 +02001811 filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01001812 }
Jeff Kingb0418302020-01-24 19:13:01 -05001813 die(_("path '%s' does not exist in '%.*s'"),
René Scharfeb2981d02013-03-16 19:29:31 +01001814 filename, object_name_len, object_name);
Matthieu Moy009fee42009-12-07 11:10:50 +01001815 }
1816}
1817
1818/* Must be called only when :stage:filename doesn't exist. */
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001819static void diagnose_invalid_index_path(struct repository *r,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001820 int stage,
Matthieu Moy009fee42009-12-07 11:10:50 +01001821 const char *prefix,
1822 const char *filename)
1823{
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001824 struct index_state *istate = r->index;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07001825 const struct cache_entry *ce;
Matthieu Moy009fee42009-12-07 11:10:50 +01001826 int pos;
1827 unsigned namelen = strlen(filename);
Jeff King43bb66a2015-09-24 17:07:52 -04001828 struct strbuf fullname = STRBUF_INIT;
Matthieu Moy009fee42009-12-07 11:10:50 +01001829
1830 if (!prefix)
1831 prefix = "";
1832
1833 /* Wrong stage number? */
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001834 pos = index_name_pos(istate, filename, namelen);
Matthieu Moy009fee42009-12-07 11:10:50 +01001835 if (pos < 0)
1836 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001837 if (pos < istate->cache_nr) {
1838 ce = istate->cache[pos];
Derrick Stolee4925adb2022-04-26 20:43:19 +00001839 if (!S_ISSPARSEDIR(ce->ce_mode) &&
1840 ce_namelen(ce) == namelen &&
Markus Heidelberg77e84662010-02-28 16:49:15 +01001841 !memcmp(ce->name, filename, namelen))
Jeff Kingb0418302020-01-24 19:13:01 -05001842 die(_("path '%s' is in the index, but not at stage %d\n"
1843 "hint: Did you mean ':%d:%s'?"),
Markus Heidelberg77e84662010-02-28 16:49:15 +01001844 filename, stage,
1845 ce_stage(ce), filename);
1846 }
Matthieu Moy009fee42009-12-07 11:10:50 +01001847
1848 /* Confusion between relative and absolute filenames? */
Jeff King43bb66a2015-09-24 17:07:52 -04001849 strbuf_addstr(&fullname, prefix);
1850 strbuf_addstr(&fullname, filename);
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001851 pos = index_name_pos(istate, fullname.buf, fullname.len);
Matthieu Moy009fee42009-12-07 11:10:50 +01001852 if (pos < 0)
1853 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001854 if (pos < istate->cache_nr) {
1855 ce = istate->cache[pos];
Derrick Stolee4925adb2022-04-26 20:43:19 +00001856 if (!S_ISSPARSEDIR(ce->ce_mode) &&
1857 ce_namelen(ce) == fullname.len &&
Jeff King43bb66a2015-09-24 17:07:52 -04001858 !memcmp(ce->name, fullname.buf, fullname.len))
Jeff Kingb0418302020-01-24 19:13:01 -05001859 die(_("path '%s' is in the index, but not '%s'\n"
1860 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
Jeff King43bb66a2015-09-24 17:07:52 -04001861 fullname.buf, filename,
1862 ce_stage(ce), fullname.buf,
Michael J Grubere41d7182011-03-31 11:17:34 +02001863 ce_stage(ce), filename);
Markus Heidelberg77e84662010-02-28 16:49:15 +01001864 }
Matthieu Moy009fee42009-12-07 11:10:50 +01001865
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001866 if (repo_file_exists(r, filename))
Jeff Kingb0418302020-01-24 19:13:01 -05001867 die(_("path '%s' exists on disk, but not in the index"), filename);
Junio C Hamanoc7054202017-05-30 09:23:33 +09001868 if (is_missing_file_error(errno))
Jeff Kingb0418302020-01-24 19:13:01 -05001869 die(_("path '%s' does not exist (neither on disk nor in the index)"),
Matthieu Moy009fee42009-12-07 11:10:50 +01001870 filename);
1871
Jeff King43bb66a2015-09-24 17:07:52 -04001872 strbuf_release(&fullname);
Matthieu Moy009fee42009-12-07 11:10:50 +01001873}
1874
1875
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001876static char *resolve_relative_path(struct repository *r, const char *rel)
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001877{
Christian Couder59556542013-11-30 21:55:40 +01001878 if (!starts_with(rel, "./") && !starts_with(rel, "../"))
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001879 return NULL;
1880
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001881 if (r != the_repository || !is_inside_work_tree())
Jeff Kingb0418302020-01-24 19:13:01 -05001882 die(_("relative path syntax can't be used outside working tree"));
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001883
1884 /* die() inside prefix_path() if resolved path is outside worktree */
1885 return prefix_path(startup_info->prefix,
1886 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1887 rel);
1888}
1889
Derrick Stolee561287d2022-04-26 20:43:18 +00001890static int reject_tree_in_index(struct repository *repo,
1891 int only_to_die,
1892 const struct cache_entry *ce,
1893 int stage,
1894 const char *prefix,
1895 const char *cp)
1896{
1897 if (!S_ISSPARSEDIR(ce->ce_mode))
1898 return 0;
1899 if (only_to_die)
1900 diagnose_invalid_index_path(repo, stage, prefix, cp);
1901 return -1;
1902}
1903
Junio C Hamano7589e632019-02-06 22:05:22 -08001904static enum get_oid_result get_oid_with_context_1(struct repository *repo,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001905 const char *name,
brian m. carlsone82caf32017-07-13 23:49:28 +00001906 unsigned flags,
1907 const char *prefix,
1908 struct object_id *oid,
1909 struct object_context *oc)
Clément Poulain573285e2010-06-09 19:02:06 +02001910{
Martin Koeglera0cd87a2007-04-23 22:55:05 +02001911 int ret, bracket_depth;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001912 int namelen = strlen(name);
1913 const char *cp;
brian m. carlson321c89b2017-07-13 23:49:29 +00001914 int only_to_die = flags & GET_OID_ONLY_TO_DIE;
Linus Torvalds51196022006-04-18 16:45:16 -07001915
Clément Poulain573285e2010-06-09 19:02:06 +02001916 memset(oc, 0, sizeof(*oc));
1917 oc->mode = S_IFINVALID;
Jeff Kingd72cae12017-05-19 08:52:25 -04001918 strbuf_init(&oc->symlink_path, 0);
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001919 ret = get_oid_1(repo, name, namelen, oid, flags);
Ævar Arnfjörð Bjarmason245b9482021-12-28 14:28:50 +01001920 if (!ret && flags & GET_OID_REQUIRE_PATH)
1921 die(_("<object>:<path> required, only <object> '%s' given"),
1922 name);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001923 if (!ret)
1924 return ret;
Junio C Hamano33bd5982012-07-02 10:32:11 -07001925 /*
Martin Ågren1e6771e2020-12-31 12:56:20 +01001926 * tree:path --> object name of path in tree
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001927 * :path -> object name of absolute path in index
1928 * :./path -> object name of path relative to cwd in index
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001929 * :[0-3]:path -> object name of path in index at stage
Matthieu Moy95ad6d22010-09-24 18:43:59 +02001930 * :/foo -> recent commit matching foo
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001931 */
1932 if (name[0] == ':') {
1933 int stage = 0;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07001934 const struct cache_entry *ce;
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001935 char *new_path = NULL;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001936 int pos;
Junio C Hamano2e83b662011-05-10 12:02:54 -07001937 if (!only_to_die && namelen > 2 && name[1] == '/') {
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001938 struct handle_one_ref_cb cb;
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001939 struct commit_list *list = NULL;
Michael Haggerty2b2a5be2015-05-25 18:38:28 +00001940
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001941 cb.repo = repo;
1942 cb.list = &list;
Junio C Hamano5ff4b922020-04-09 17:03:45 -07001943 refs_for_each_ref(get_main_ref_store(repo), handle_one_ref, &cb);
Jeff King02204612020-04-09 23:04:11 -04001944 refs_head_ref(get_main_ref_store(repo), handle_one_ref, &cb);
René Scharfee8d1dfe2014-08-21 20:30:29 +02001945 commit_list_sort_by_date(&list);
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001946 return get_oid_oneline(repo, name + 2, oid, list);
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001947 }
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001948 if (namelen < 3 ||
1949 name[2] != ':' ||
1950 name[1] < '0' || '3' < name[1])
1951 cp = name + 1;
1952 else {
1953 stage = name[1] - '0';
1954 cp = name + 3;
Linus Torvalds51196022006-04-18 16:45:16 -07001955 }
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001956 new_path = resolve_relative_path(repo, cp);
Junio C Hamano3d6e0f72010-12-09 13:38:05 -08001957 if (!new_path) {
1958 namelen = namelen - (cp - name);
1959 } else {
1960 cp = new_path;
1961 namelen = strlen(cp);
1962 }
Clément Poulain573285e2010-06-09 19:02:06 +02001963
brian m. carlson321c89b2017-07-13 23:49:29 +00001964 if (flags & GET_OID_RECORD_PATH)
Jeff Kingdc944b62017-05-19 08:54:43 -04001965 oc->path = xstrdup(cp);
Clément Poulain573285e2010-06-09 19:02:06 +02001966
Jeff King581d2fd2019-05-14 09:54:55 -04001967 if (!repo->index || !repo->index->cache)
Nguyễn Thái Ngọc Duyefe461b2019-04-16 16:33:36 +07001968 repo_read_index(repo);
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001969 pos = index_name_pos(repo->index, cp, namelen);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001970 if (pos < 0)
1971 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001972 while (pos < repo->index->cache_nr) {
1973 ce = repo->index->cache[pos];
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001974 if (ce_namelen(ce) != namelen ||
1975 memcmp(ce->name, cp, namelen))
1976 break;
1977 if (ce_stage(ce) == stage) {
Derrick Stolee561287d2022-04-26 20:43:18 +00001978 free(new_path);
1979 if (reject_tree_in_index(repo, only_to_die, ce,
1980 stage, prefix, cp))
1981 return -1;
brian m. carlsone82caf32017-07-13 23:49:28 +00001982 oidcpy(oid, &ce->oid);
Kirill Smelkov90064712010-09-29 15:35:24 +04001983 oc->mode = ce->ce_mode;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001984 return 0;
1985 }
Junio C Hamanoe7cef452006-05-08 15:44:06 -07001986 pos++;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001987 }
Junio C Hamano2e83b662011-05-10 12:02:54 -07001988 if (only_to_die && name[1] && name[1] != '/')
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001989 diagnose_invalid_index_path(repo, stage, prefix, cp);
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001990 free(new_path);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001991 return -1;
1992 }
Shawn Pearcecce91a22006-05-19 03:29:43 -04001993 for (cp = name, bracket_depth = 0; *cp; cp++) {
1994 if (*cp == '{')
1995 bracket_depth++;
1996 else if (bracket_depth && *cp == '}')
1997 bracket_depth--;
1998 else if (!bracket_depth && *cp == ':')
1999 break;
2000 }
2001 if (*cp == ':') {
brian m. carlsone82caf32017-07-13 23:49:28 +00002002 struct object_id tree_oid;
René Scharfeb2981d02013-03-16 19:29:31 +01002003 int len = cp - name;
Jeff King8a10fea2016-09-26 07:59:41 -04002004 unsigned sub_flags = flags;
2005
brian m. carlson321c89b2017-07-13 23:49:29 +00002006 sub_flags &= ~GET_OID_DISAMBIGUATORS;
2007 sub_flags |= GET_OID_TREEISH;
Jeff King8a10fea2016-09-26 07:59:41 -04002008
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07002009 if (!get_oid_1(repo, name, len, &tree_oid, sub_flags)) {
Matthieu Moy009fee42009-12-07 11:10:50 +01002010 const char *filename = cp+1;
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07002011 char *new_filename = NULL;
2012
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07002013 new_filename = resolve_relative_path(repo, filename);
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07002014 if (new_filename)
2015 filename = new_filename;
brian m. carlson321c89b2017-07-13 23:49:29 +00002016 if (flags & GET_OID_FOLLOW_SYMLINKS) {
Nguyễn Thái Ngọc Duy0dd1f0c2019-06-27 16:28:50 +07002017 ret = get_tree_entry_follow_symlinks(repo, &tree_oid,
brian m. carlson3b683bc2018-05-02 00:25:40 +00002018 filename, oid, &oc->symlink_path,
David Turnerc4ec9672015-05-20 13:03:39 -04002019 &oc->mode);
2020 } else {
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07002021 ret = get_tree_entry(repo, &tree_oid, filename, oid,
brian m. carlson916bc352018-03-12 02:27:51 +00002022 &oc->mode);
David Turnerc4ec9672015-05-20 13:03:39 -04002023 if (ret && only_to_die) {
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07002024 diagnose_invalid_oid_path(repo, prefix,
David Turnerc4ec9672015-05-20 13:03:39 -04002025 filename,
brian m. carlsone82caf32017-07-13 23:49:28 +00002026 &tree_oid,
David Turnerc4ec9672015-05-20 13:03:39 -04002027 name, len);
2028 }
Matthieu Moy009fee42009-12-07 11:10:50 +01002029 }
brian m. carlson321c89b2017-07-13 23:49:29 +00002030 if (flags & GET_OID_RECORD_PATH)
Jeff Kingdc944b62017-05-19 08:54:43 -04002031 oc->path = xstrdup(filename);
Clément Poulain573285e2010-06-09 19:02:06 +02002032
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07002033 free(new_filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01002034 return ret;
2035 } else {
Junio C Hamano2e83b662011-05-10 12:02:54 -07002036 if (only_to_die)
Jeff Kingb0418302020-01-24 19:13:01 -05002037 die(_("invalid object name '%.*s'."), len, name);
Matthieu Moy009fee42009-12-07 11:10:50 +01002038 }
Linus Torvalds51196022006-04-18 16:45:16 -07002039 }
2040 return ret;
Junio C Hamano9938af62005-08-03 22:15:49 -07002041}
Junio C Hamanof01cc142012-07-02 10:19:35 -07002042
Junio C Hamano8c135ea2012-07-02 11:01:25 -07002043/*
2044 * Call this function when you know "name" given by the end user must
2045 * name an object but it doesn't; the function _may_ die with a better
2046 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
2047 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
2048 * you have a chance to diagnose the error further.
2049 */
Nguyễn Thái Ngọc Duye270f422019-04-16 16:33:39 +07002050void maybe_die_on_misspelt_object_name(struct repository *r,
2051 const char *name,
2052 const char *prefix)
Junio C Hamanof01cc142012-07-02 10:19:35 -07002053{
2054 struct object_context oc;
brian m. carlsone82caf32017-07-13 23:49:28 +00002055 struct object_id oid;
Ævar Arnfjörð Bjarmason9ce60002021-12-28 14:28:49 +01002056 get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE | GET_OID_QUIETLY,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07002057 prefix, &oid, &oc);
Junio C Hamano8c135ea2012-07-02 11:01:25 -07002058}
2059
Duy Nguyen127b48f2019-02-12 19:43:23 +07002060enum get_oid_result get_oid_with_context(struct repository *repo,
2061 const char *str,
2062 unsigned flags,
2063 struct object_id *oid,
2064 struct object_context *oc)
Junio C Hamanof01cc142012-07-02 10:19:35 -07002065{
brian m. carlson321c89b2017-07-13 23:49:29 +00002066 if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
Martin Ågren1e6771e2020-12-31 12:56:20 +01002067 BUG("incompatible flags for get_oid_with_context");
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07002068 return get_oid_with_context_1(repo, str, flags, NULL, oid, oc);
Junio C Hamanof01cc142012-07-02 10:19:35 -07002069}