blob: 1be2ad1a16c6a49736e2fdd25c4ba723dbaf5267 [file] [log] [blame]
Elijah Newrenbc5c5ec2023-05-16 06:33:57 +00001#include "git-compat-util.h"
Elijah Newrendabab1d2023-04-11 00:41:49 -07002#include "object-name.h"
Elijah Newren6c6ddf92023-04-11 03:00:39 +00003#include "advice.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07004#include "config.h"
Elijah Newren32a8f512023-03-21 06:26:03 +00005#include "environment.h"
Elijah Newrenf394e092023-03-21 06:25:54 +00006#include "gettext.h"
Elijah Newren41771fa2023-02-24 00:09:27 +00007#include "hex.h"
Junio C Hamano5385f522005-10-13 18:57:40 -07008#include "tag.h"
Junio C Hamano9938af62005-08-03 22:15:49 -07009#include "commit.h"
Junio C Hamano5385f522005-10-13 18:57:40 -070010#include "tree.h"
Junio C Hamanof3ab49d2006-04-19 11:56:53 -070011#include "tree-walk.h"
Shawn Pearced556fae2006-05-17 05:56:09 -040012#include "refs.h"
Johannes Schindelin28fb8432009-09-10 17:25:57 +020013#include "remote.h"
René Scharfedbe44fa2015-05-19 23:44:23 +020014#include "dir.h"
Jeff Kingfe299ec2020-03-30 10:03:46 -040015#include "oid-array.h"
Elijah Newrene3d2f202023-04-22 20:17:27 +000016#include "oidtree.h"
Jonathan Tan0317f452017-08-18 15:20:19 -070017#include "packfile.h"
Elijah Newrend4a4f922023-04-22 20:17:26 +000018#include "pretty.h"
Elijah Newrena034e912023-05-16 06:34:06 +000019#include "object-store-ll.h"
Elijah Newren08c46a42023-05-16 06:33:56 +000020#include "read-cache-ll.h"
Stefan Beller031dc922018-03-23 18:20:57 +010021#include "repository.h"
Elijah Newrene38da482023-03-21 06:26:05 +000022#include "setup.h"
Derrick Stolee8aac67a2018-07-12 15:39:35 -040023#include "midx.h"
Derrick Stolee64043552018-07-20 16:33:04 +000024#include "commit-reach.h"
Ævar Arnfjörð Bjarmason88c7b4c2022-02-16 09:14:02 +010025#include "date.h"
Eric W. Biederman52fca062023-10-01 21:40:07 -050026#include "object-file-convert.h"
Junio C Hamano9938af62005-08-03 22:15:49 -070027
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +070028static 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 +070029
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070030typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070031
32struct disambiguate_state {
Jeff King00160432016-09-26 08:00:04 -040033 int len; /* length of prefix in hex chars */
brian m. carlsondc015052017-03-26 16:01:24 +000034 char hex_pfx[GIT_MAX_HEXSZ + 1];
brian m. carlsond2ee1182017-03-26 16:01:33 +000035 struct object_id bin_pfx;
Jeff King00160432016-09-26 08:00:04 -040036
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070037 struct repository *repo;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070038 disambiguate_hint_fn fn;
39 void *cb_data;
brian m. carlsond2ee1182017-03-26 16:01:33 +000040 struct object_id candidate;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070041 unsigned candidate_exists:1;
42 unsigned candidate_checked:1;
43 unsigned candidate_ok:1;
44 unsigned disambiguate_fn_used:1;
45 unsigned ambiguous:1;
Junio C Hamano957d7402012-07-03 14:21:59 -070046 unsigned always_call_fn:1;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070047};
48
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000049static void update_candidates(struct disambiguate_state *ds, const struct object_id *current)
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070050{
Eric W. Biederman52fca062023-10-01 21:40:07 -050051 /* The hash algorithm of current has already been filtered */
Junio C Hamano957d7402012-07-03 14:21:59 -070052 if (ds->always_call_fn) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070053 ds->ambiguous = ds->fn(ds->repo, current, ds->cb_data) ? 1 : 0;
Junio C Hamano957d7402012-07-03 14:21:59 -070054 return;
55 }
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070056 if (!ds->candidate_exists) {
57 /* this is the first candidate */
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000058 oidcpy(&ds->candidate, current);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070059 ds->candidate_exists = 1;
60 return;
Jeff King4a7e27e2018-08-28 17:22:40 -040061 } else if (oideq(&ds->candidate, current)) {
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070062 /* the same as what we already have seen */
63 return;
64 }
65
66 if (!ds->fn) {
67 /* cannot disambiguate between ds->candidate and current */
68 ds->ambiguous = 1;
69 return;
70 }
71
72 if (!ds->candidate_checked) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070073 ds->candidate_ok = ds->fn(ds->repo, &ds->candidate, ds->cb_data);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070074 ds->disambiguate_fn_used = 1;
75 ds->candidate_checked = 1;
76 }
77
78 if (!ds->candidate_ok) {
Ondřej Bílka749f7632013-07-22 23:02:23 +020079 /* discard the candidate; we know it does not satisfy fn */
brian m. carlsond2b7d9c2017-03-26 16:01:34 +000080 oidcpy(&ds->candidate, current);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070081 ds->candidate_checked = 0;
82 return;
83 }
84
85 /* if we reach this point, we know ds->candidate satisfies fn */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +070086 if (ds->fn(ds->repo, current, ds->cb_data)) {
Junio C Hamanoa78fafe2012-06-20 22:07:36 -070087 /*
88 * if both current and candidate satisfy fn, we cannot
89 * disambiguate.
90 */
91 ds->candidate_ok = 0;
92 ds->ambiguous = 1;
93 }
94
95 /* otherwise, current can be discarded and candidate is still good */
96}
97
Martin Ågren1e6771e2020-12-31 12:56:20 +010098static int match_hash(unsigned, const unsigned char *, const unsigned char *);
René Scharfecc817ca2017-06-22 20:19:48 +020099
Eric Wong92d8ed82021-07-07 23:10:19 +0000100static enum cb_next match_prefix(const struct object_id *oid, void *arg)
101{
102 struct disambiguate_state *ds = arg;
103 /* no need to call match_hash, oidtree_each did prefix match */
104 update_candidates(ds, oid);
105 return ds->ambiguous ? CB_BREAK : CB_CONTINUE;
106}
107
Jeff King00160432016-09-26 08:00:04 -0400108static void find_short_object_filename(struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700109{
Jeff King263db402018-11-12 09:48:47 -0500110 struct object_directory *odb;
Junio C Hamano9938af62005-08-03 22:15:49 -0700111
Eric Wong92d8ed82021-07-07 23:10:19 +0000112 for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next)
113 oidtree_each(odb_loose_cache(odb, &ds->bin_pfx),
114 &ds->bin_pfx, ds->len, match_prefix, ds);
Junio C Hamano9938af62005-08-03 22:15:49 -0700115}
116
Martin Ågren1e6771e2020-12-31 12:56:20 +0100117static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b)
Junio C Hamano9938af62005-08-03 22:15:49 -0700118{
119 do {
120 if (*a != *b)
121 return 0;
122 a++;
123 b++;
124 len -= 2;
125 } while (len > 1);
126 if (len)
127 if ((*a ^ *b) & 0xf0)
128 return 0;
129 return 1;
130}
131
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400132static void unique_in_midx(struct multi_pack_index *m,
133 struct disambiguate_state *ds)
134{
135 uint32_t num, i, first = 0;
136 const struct object_id *current = NULL;
Eric W. Biederman52fca062023-10-01 21:40:07 -0500137 int len = ds->len > ds->repo->hash_algo->hexsz ?
138 ds->repo->hash_algo->hexsz : ds->len;
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400139 num = m->num_objects;
140
141 if (!num)
142 return;
143
144 bsearch_midx(&ds->bin_pfx, m, &first);
145
146 /*
147 * At this point, "first" is the location of the lowest object
148 * with an object name that could match "bin_pfx". See if we have
149 * 0, 1 or more objects that actually match(es).
150 */
151 for (i = first; i < num && !ds->ambiguous; i++) {
152 struct object_id oid;
153 current = nth_midxed_object_oid(&oid, m, i);
Eric W. Biederman52fca062023-10-01 21:40:07 -0500154 if (!match_hash(len, ds->bin_pfx.hash, current->hash))
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400155 break;
156 update_candidates(ds, current);
157 }
158}
159
Jeff King00160432016-09-26 08:00:04 -0400160static void unique_in_pack(struct packed_git *p,
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700161 struct disambiguate_state *ds)
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700162{
René Scharfe902f5a22018-03-24 17:41:08 +0100163 uint32_t num, i, first = 0;
Eric W. Biederman52fca062023-10-01 21:40:07 -0500164 int len = ds->len > ds->repo->hash_algo->hexsz ?
165 ds->repo->hash_algo->hexsz : ds->len;
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700166
Derrick Stoleeaf96fe32019-04-29 09:18:56 -0700167 if (p->multi_pack_index)
168 return;
169
Derrick Stolee0e87b852017-10-12 08:02:20 -0400170 if (open_pack_index(p) || !p->num_objects)
171 return;
172
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700173 num = p->num_objects;
René Scharfe902f5a22018-03-24 17:41:08 +0100174 bsearch_pack(&ds->bin_pfx, p, &first);
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700175
176 /*
177 * At this point, "first" is the location of the lowest object
Junio C Hamano1703f9a2012-06-20 22:35:43 -0700178 * with an object name that could match "bin_pfx". See if we have
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700179 * 0, 1 or more objects that actually match(es).
180 */
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700181 for (i = first; i < num && !ds->ambiguous; i++) {
brian m. carlsond2b7d9c2017-03-26 16:01:34 +0000182 struct object_id oid;
Jeff King07636712020-02-23 23:27:36 -0500183 nth_packed_object_id(&oid, p, i);
Eric W. Biederman52fca062023-10-01 21:40:07 -0500184 if (!match_hash(len, ds->bin_pfx.hash, oid.hash))
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700185 break;
Jeff King07636712020-02-23 23:27:36 -0500186 update_candidates(ds, &oid);
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700187 }
Junio C Hamanof703e6e2012-06-18 13:10:38 -0700188}
189
Jeff King00160432016-09-26 08:00:04 -0400190static void find_short_packed_object(struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700191{
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400192 struct multi_pack_index *m;
Junio C Hamano9938af62005-08-03 22:15:49 -0700193 struct packed_git *p;
194
Eric W. Biederman52fca062023-10-01 21:40:07 -0500195 /* Skip, unless oids from the storage hash algorithm are wanted */
196 if (ds->bin_pfx.algo && (&hash_algos[ds->bin_pfx.algo] != ds->repo->hash_algo))
197 return;
198
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700199 for (m = get_multi_pack_index(ds->repo); m && !ds->ambiguous;
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400200 m = m->next)
201 unique_in_midx(m, ds);
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700202 for (p = get_packed_git(ds->repo); p && !ds->ambiguous;
Stefan Bellera80d72d2018-03-23 18:20:59 +0100203 p = p->next)
Jeff King00160432016-09-26 08:00:04 -0400204 unique_in_pack(p, ds);
Junio C Hamano99a19b42005-10-02 21:40:51 -0700205}
206
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700207static int finish_object_disambiguation(struct disambiguate_state *ds,
brian m. carlsone82caf32017-07-13 23:49:28 +0000208 struct object_id *oid)
Junio C Hamano99a19b42005-10-02 21:40:51 -0700209{
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700210 if (ds->ambiguous)
211 return SHORT_NAME_AMBIGUOUS;
Junio C Hamano99a19b42005-10-02 21:40:51 -0700212
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700213 if (!ds->candidate_exists)
David Turnerd1dd94b2019-01-17 23:19:43 -0500214 return MISSING_OBJECT;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700215
216 if (!ds->candidate_checked)
217 /*
218 * If this is the only candidate, there is no point
219 * calling the disambiguation hint callback.
220 *
221 * On the other hand, if the current candidate
222 * replaced an earlier candidate that did _not_ pass
223 * the disambiguation hint callback, then we do have
224 * more than one objects that match the short name
225 * given, so we should make sure this one matches;
226 * otherwise, if we discovered this one and the one
227 * that we previously discarded in the reverse order,
228 * we would end up showing different results in the
229 * same repository!
230 */
231 ds->candidate_ok = (!ds->disambiguate_fn_used ||
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700232 ds->fn(ds->repo, &ds->candidate, ds->cb_data));
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700233
234 if (!ds->candidate_ok)
Junio C Hamano013f2762005-10-11 15:22:48 -0700235 return SHORT_NAME_AMBIGUOUS;
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700236
brian m. carlsone82caf32017-07-13 23:49:28 +0000237 oidcpy(oid, &ds->candidate);
Junio C Hamano9938af62005-08-03 22:15:49 -0700238 return 0;
239}
240
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700241static int disambiguate_commit_only(struct repository *r,
242 const struct object_id *oid,
Jeff King07ffb952023-02-24 01:38:30 -0500243 void *cb_data UNUSED)
Junio C Hamano9938af62005-08-03 22:15:49 -0700244{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700245 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700246 return kind == OBJ_COMMIT;
247}
Junio C Hamano9938af62005-08-03 22:15:49 -0700248
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700249static int disambiguate_committish_only(struct repository *r,
250 const struct object_id *oid,
Jeff King07ffb952023-02-24 01:38:30 -0500251 void *cb_data UNUSED)
Junio C Hamanoe2643612012-07-02 10:00:40 -0700252{
253 struct object *obj;
254 int kind;
255
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700256 kind = oid_object_info(r, oid, NULL);
Junio C Hamanoe2643612012-07-02 10:00:40 -0700257 if (kind == OBJ_COMMIT)
258 return 1;
259 if (kind != OBJ_TAG)
260 return 0;
261
262 /* We need to do this the hard way... */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700263 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
Junio C Hamanoe2643612012-07-02 10:00:40 -0700264 if (obj && obj->type == OBJ_COMMIT)
265 return 1;
266 return 0;
267}
268
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700269static int disambiguate_tree_only(struct repository *r,
270 const struct object_id *oid,
Jeff King07ffb952023-02-24 01:38:30 -0500271 void *cb_data UNUSED)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700272{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700273 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700274 return kind == OBJ_TREE;
275}
276
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700277static int disambiguate_treeish_only(struct repository *r,
278 const struct object_id *oid,
Jeff King07ffb952023-02-24 01:38:30 -0500279 void *cb_data UNUSED)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700280{
281 struct object *obj;
282 int kind;
283
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700284 kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700285 if (kind == OBJ_TREE || kind == OBJ_COMMIT)
286 return 1;
287 if (kind != OBJ_TAG)
288 return 0;
289
290 /* We need to do this the hard way... */
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700291 obj = deref_tag(r, parse_object(r, oid), NULL, 0);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700292 if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
293 return 1;
294 return 0;
295}
296
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700297static int disambiguate_blob_only(struct repository *r,
298 const struct object_id *oid,
Jeff King07ffb952023-02-24 01:38:30 -0500299 void *cb_data UNUSED)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700300{
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700301 int kind = oid_object_info(r, oid, NULL);
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700302 return kind == OBJ_BLOB;
303}
304
Jeff King5b33cb12016-09-27 08:38:01 -0400305static disambiguate_hint_fn default_disambiguate_hint;
306
307int set_disambiguate_hint_config(const char *var, const char *value)
308{
309 static const struct {
310 const char *name;
311 disambiguate_hint_fn fn;
312 } hints[] = {
313 { "none", NULL },
314 { "commit", disambiguate_commit_only },
315 { "committish", disambiguate_committish_only },
316 { "tree", disambiguate_tree_only },
317 { "treeish", disambiguate_treeish_only },
318 { "blob", disambiguate_blob_only }
319 };
320 int i;
321
322 if (!value)
323 return config_error_nonbool(var);
324
325 for (i = 0; i < ARRAY_SIZE(hints); i++) {
326 if (!strcasecmp(value, hints[i].name)) {
327 default_disambiguate_hint = hints[i].fn;
328 return 0;
329 }
330 }
331
332 return error("unknown hint type for '%s': %s", var, value);
333}
334
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700335static int init_object_disambiguation(struct repository *r,
336 const char *name, int len,
Eric W. Biederman52fca062023-10-01 21:40:07 -0500337 const struct git_hash_algo *algo,
Jeff King00160432016-09-26 08:00:04 -0400338 struct disambiguate_state *ds)
Junio C Hamano9938af62005-08-03 22:15:49 -0700339{
Junio C Hamano957d7402012-07-03 14:21:59 -0700340 int i;
Junio C Hamano9938af62005-08-03 22:15:49 -0700341
Eric W. Biederman52fca062023-10-01 21:40:07 -0500342 if (len < MINIMUM_ABBREV || len > GIT_MAX_HEXSZ)
Jeff King00160432016-09-26 08:00:04 -0400343 return -1;
344
345 memset(ds, 0, sizeof(*ds));
Jeff King00160432016-09-26 08:00:04 -0400346
Linus Torvaldsaf61c6e2005-09-19 15:16:03 -0700347 for (i = 0; i < len ;i++) {
Junio C Hamano9938af62005-08-03 22:15:49 -0700348 unsigned char c = name[i];
349 unsigned char val;
Junio C Hamano9938af62005-08-03 22:15:49 -0700350 if (c >= '0' && c <= '9')
351 val = c - '0';
352 else if (c >= 'a' && c <= 'f')
353 val = c - 'a' + 10;
354 else if (c >= 'A' && c <='F') {
355 val = c - 'A' + 10;
356 c -= 'A' - 'a';
357 }
358 else
359 return -1;
Jeff King00160432016-09-26 08:00:04 -0400360 ds->hex_pfx[i] = c;
Junio C Hamano9938af62005-08-03 22:15:49 -0700361 if (!(i & 1))
362 val <<= 4;
brian m. carlsond2ee1182017-03-26 16:01:33 +0000363 ds->bin_pfx.hash[i >> 1] |= val;
Junio C Hamano9938af62005-08-03 22:15:49 -0700364 }
Jeff King00160432016-09-26 08:00:04 -0400365
366 ds->len = len;
Jeff King59e4e342016-09-26 08:00:07 -0400367 ds->hex_pfx[len] = '\0';
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700368 ds->repo = r;
Eric W. Biederman52fca062023-10-01 21:40:07 -0500369 ds->bin_pfx.algo = algo ? hash_algo_by_ptr(algo) : GIT_HASH_UNKNOWN;
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700370 prepare_alt_odb(r);
Junio C Hamano957d7402012-07-03 14:21:59 -0700371 return 0;
372}
Junio C Hamano99a19b42005-10-02 21:40:51 -0700373
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100374struct ambiguous_output {
375 const struct disambiguate_state *ds;
376 struct strbuf advice;
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100377 struct strbuf sb;
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100378};
379
brian m. carlson1b7ba792017-03-31 01:39:59 +0000380static int show_ambiguous_object(const struct object_id *oid, void *data)
Jeff King1ffa26c2016-09-26 08:00:36 -0400381{
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100382 struct ambiguous_output *state = data;
383 const struct disambiguate_state *ds = state->ds;
384 struct strbuf *advice = &state->advice;
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100385 struct strbuf *sb = &state->sb;
Jeff King1ffa26c2016-09-26 08:00:36 -0400386 int type;
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100387 const char *hash;
Jeff King1ffa26c2016-09-26 08:00:36 -0400388
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700389 if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data))
Jeff King1ffa26c2016-09-26 08:00:36 -0400390 return 0;
391
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100392 hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV);
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700393 type = oid_object_info(ds->repo, oid, NULL);
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100394
395 if (type < 0) {
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100396 /*
397 * TRANSLATORS: This is a line of ambiguous object
398 * output shown when we cannot look up or parse the
399 * object in question. E.g. "deadbeef [bad object]".
400 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100401 strbuf_addf(sb, _("%s [bad object]"), hash);
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100402 goto out;
403 }
404
405 assert(type == OBJ_TREE || type == OBJ_COMMIT ||
406 type == OBJ_BLOB || type == OBJ_TAG);
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100407
Jeff King1ffa26c2016-09-26 08:00:36 -0400408 if (type == OBJ_COMMIT) {
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100409 struct strbuf date = STRBUF_INIT;
410 struct strbuf msg = STRBUF_INIT;
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700411 struct commit *commit = lookup_commit(ds->repo, oid);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100412
Jeff King1ffa26c2016-09-26 08:00:36 -0400413 if (commit) {
414 struct pretty_print_context pp = {0};
415 pp.date_mode.type = DATE_SHORT;
Ævar Arnfjörð Bjarmasonbab82162023-03-28 15:58:51 +0200416 repo_format_commit_message(the_repository, commit,
417 "%ad", &date, &pp);
418 repo_format_commit_message(the_repository, commit,
419 "%s", &msg, &pp);
Jeff King1ffa26c2016-09-26 08:00:36 -0400420 }
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100421
422 /*
423 * TRANSLATORS: This is a line of ambiguous commit
424 * object output. E.g.:
425 *
426 * "deadbeef commit 2021-01-01 - Some Commit Message"
427 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100428 strbuf_addf(sb, _("%s commit %s - %s"), hash, date.buf,
429 msg.buf);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100430
431 strbuf_release(&date);
432 strbuf_release(&msg);
Jeff King1ffa26c2016-09-26 08:00:36 -0400433 } else if (type == OBJ_TAG) {
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700434 struct tag *tag = lookup_tag(ds->repo, oid);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100435
436 if (!parse_tag(tag) && tag->tag) {
437 /*
438 * TRANSLATORS: This is a line of ambiguous
439 * tag object output. E.g.:
440 *
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100441 * "deadbeef tag 2022-01-01 - Some Tag Message"
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100442 *
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100443 * The second argument is the YYYY-MM-DD found
444 * in the tag.
445 *
446 * The third argument is the "tag" string
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100447 * from object.c.
448 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100449 strbuf_addf(sb, _("%s tag %s - %s"), hash,
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100450 show_date(tag->date, 0, DATE_MODE(SHORT)),
451 tag->tag);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100452 } else {
453 /*
454 * TRANSLATORS: This is a line of ambiguous
455 * tag object output where we couldn't parse
456 * the tag itself. E.g.:
457 *
Ævar Arnfjörð Bjarmason851b3d72022-01-27 06:26:47 +0100458 * "deadbeef [bad tag, could not parse it]"
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100459 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100460 strbuf_addf(sb, _("%s [bad tag, could not parse it]"),
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100461 hash);
462 }
463 } else if (type == OBJ_TREE) {
464 /*
465 * TRANSLATORS: This is a line of ambiguous <type>
466 * object output. E.g. "deadbeef tree".
467 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100468 strbuf_addf(sb, _("%s tree"), hash);
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100469 } else if (type == OBJ_BLOB) {
470 /*
471 * TRANSLATORS: This is a line of ambiguous <type>
472 * object output. E.g. "deadbeef blob".
473 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100474 strbuf_addf(sb, _("%s blob"), hash);
Jeff King1ffa26c2016-09-26 08:00:36 -0400475 }
476
Jeff King1ffa26c2016-09-26 08:00:36 -0400477
Ævar Arnfjörð Bjarmason6780e682022-01-27 06:26:44 +0100478out:
Ævar Arnfjörð Bjarmasonba5e8a02022-01-27 06:26:46 +0100479 /*
480 * TRANSLATORS: This is line item of ambiguous object output
481 * from describe_ambiguous_object() above. For RTL languages
482 * you'll probably want to swap the "%s" and leading " " space
483 * around.
484 */
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100485 strbuf_addf(advice, _(" %s\n"), sb->buf);
Jeff King1ffa26c2016-09-26 08:00:36 -0400486
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100487 strbuf_reset(sb);
Jeff King1ffa26c2016-09-26 08:00:36 -0400488 return 0;
489}
490
Ævar Arnfjörð Bjarmasona885c932018-05-10 12:43:01 +0000491static int collect_ambiguous(const struct object_id *oid, void *data)
492{
493 oid_array_append(data, oid);
494 return 0;
495}
496
Jeff King07ffb952023-02-24 01:38:30 -0500497static int repo_collect_ambiguous(struct repository *r UNUSED,
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700498 const struct object_id *oid,
499 void *data)
500{
501 return collect_ambiguous(oid, data);
502}
503
Eric W. Biederman52fca062023-10-01 21:40:07 -0500504static int sort_ambiguous(const void *va, const void *vb, void *ctx)
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000505{
René Scharfe7cfcb162019-08-20 20:49:12 +0200506 struct repository *sort_ambiguous_repo = ctx;
Eric W. Biederman52fca062023-10-01 21:40:07 -0500507 const struct object_id *a = va, *b = vb;
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700508 int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
509 int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000510 int a_type_sort;
511 int b_type_sort;
512
513 /*
514 * Sorts by hash within the same object type, just as
515 * oid_array_for_each_unique() would do.
516 */
Eric W. Biederman52fca062023-10-01 21:40:07 -0500517 if (a_type == b_type) {
518 if (a->algo == b->algo)
519 return oidcmp(a, b);
520 else
521 return a->algo > b->algo ? 1 : -1;
522 }
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000523
524 /*
525 * Between object types show tags, then commits, and finally
526 * trees and blobs.
527 *
528 * The object_type enum is commit, tree, blob, tag, but we
529 * want tag, commit, tree blob. Cleverly (perhaps too
530 * cleverly) do that with modulus, since the enum assigns 1 to
531 * commit, so tag becomes 0.
532 */
533 a_type_sort = a_type % 4;
534 b_type_sort = b_type % 4;
535 return a_type_sort > b_type_sort ? 1 : -1;
536}
537
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700538static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
539{
René Scharfe7cfcb162019-08-20 20:49:12 +0200540 QSORT_S(a->oid, a->nr, sort_ambiguous, r);
Nguyễn Thái Ngọc Duyfae2ae42019-04-16 16:33:20 +0700541}
542
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700543static enum get_oid_result get_short_oid(struct repository *r,
544 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -0500545 struct object_id *oid,
546 unsigned flags)
Junio C Hamano957d7402012-07-03 14:21:59 -0700547{
548 int status;
Junio C Hamano957d7402012-07-03 14:21:59 -0700549 struct disambiguate_state ds;
brian m. carlson321c89b2017-07-13 23:49:29 +0000550 int quietly = !!(flags & GET_OID_QUIETLY);
Eric W. Biederman52fca062023-10-01 21:40:07 -0500551 const struct git_hash_algo *algo = r->hash_algo;
Junio C Hamano957d7402012-07-03 14:21:59 -0700552
Eric W. Biederman52fca062023-10-01 21:40:07 -0500553 if (flags & GET_OID_HASH_ANY)
554 algo = NULL;
555
556 if (init_object_disambiguation(r, name, len, algo, &ds) < 0)
Junio C Hamano957d7402012-07-03 14:21:59 -0700557 return -1;
Jeff King259942f2016-09-26 07:59:01 -0400558
brian m. carlson321c89b2017-07-13 23:49:29 +0000559 if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
Johannes Schindelin033abf92018-05-02 11:38:39 +0200560 BUG("multiple get_short_oid disambiguator flags");
Jeff King259942f2016-09-26 07:59:01 -0400561
brian m. carlson321c89b2017-07-13 23:49:29 +0000562 if (flags & GET_OID_COMMIT)
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700563 ds.fn = disambiguate_commit_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000564 else if (flags & GET_OID_COMMITTISH)
Junio C Hamanoe2643612012-07-02 10:00:40 -0700565 ds.fn = disambiguate_committish_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000566 else if (flags & GET_OID_TREE)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700567 ds.fn = disambiguate_tree_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000568 else if (flags & GET_OID_TREEISH)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700569 ds.fn = disambiguate_treeish_only;
brian m. carlson321c89b2017-07-13 23:49:29 +0000570 else if (flags & GET_OID_BLOB)
Junio C Hamanodaba53a2012-07-02 23:35:05 -0700571 ds.fn = disambiguate_blob_only;
Jeff King5b33cb12016-09-27 08:38:01 -0400572 else
573 ds.fn = default_disambiguate_hint;
Junio C Hamanoaa1dec92012-06-20 23:03:09 -0700574
Jeff King00160432016-09-26 08:00:04 -0400575 find_short_object_filename(&ds);
576 find_short_packed_object(&ds);
brian m. carlsone82caf32017-07-13 23:49:28 +0000577 status = finish_object_disambiguation(&ds, oid);
Junio C Hamanoa78fafe2012-06-20 22:07:36 -0700578
Johannes Schindelin6d67a992019-03-13 03:16:34 -0700579 /*
580 * If we didn't find it, do the usual reprepare() slow-path,
581 * since the object may have recently been added to the repository
582 * or migrated from loose to packed.
583 */
584 if (status == MISSING_OBJECT) {
Nguyễn Thái Ngọc Duy34e77712019-06-27 16:28:52 +0700585 reprepare_packed_git(r);
Johannes Schindelin6d67a992019-03-13 03:16:34 -0700586 find_short_object_filename(&ds);
587 find_short_packed_object(&ds);
588 status = finish_object_disambiguation(&ds, oid);
589 }
590
Jeff King1ffa26c2016-09-26 08:00:36 -0400591 if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000592 struct oid_array collect = OID_ARRAY_INIT;
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100593 struct ambiguous_output out = {
594 .ds = &ds,
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100595 .sb = STRBUF_INIT,
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100596 .advice = STRBUF_INIT,
597 };
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000598
Martin Ågren1e6771e2020-12-31 12:56:20 +0100599 error(_("short object ID %s is ambiguous"), ds.hex_pfx);
Jeff King1ffa26c2016-09-26 08:00:36 -0400600
601 /*
602 * We may still have ambiguity if we simply saw a series of
603 * candidates that did not satisfy our hint function. In
604 * that case, we still want to show them, so disable the hint
605 * function entirely.
606 */
607 if (!ds.ambiguous)
608 ds.fn = NULL;
609
Eric W. Biederman52fca062023-10-01 21:40:07 -0500610 repo_for_each_abbrev(r, ds.hex_pfx, algo, collect_ambiguous, &collect);
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +0700611 sort_ambiguous_oid_array(r, &collect);
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000612
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100613 if (oid_array_for_each(&collect, show_ambiguous_object, &out))
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000614 BUG("show_ambiguous_object shouldn't return non-zero");
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100615
616 /*
617 * TRANSLATORS: The argument is the list of ambiguous
618 * objects composed in show_ambiguous_object(). See
619 * its "TRANSLATORS" comments for details.
620 */
621 advise(_("The candidates are:\n%s"), out.advice.buf);
622
Ævar Arnfjörð Bjarmason5cc044e2018-05-10 12:43:02 +0000623 oid_array_clear(&collect);
Ævar Arnfjörð Bjarmasond2ef3cb2022-01-27 06:26:48 +0100624 strbuf_release(&out.advice);
Ævar Arnfjörð Bjarmason3a73c1d2022-01-27 06:26:49 +0100625 strbuf_release(&out.sb);
Jeff King1ffa26c2016-09-26 08:00:36 -0400626 }
627
Junio C Hamano013f2762005-10-11 15:22:48 -0700628 return status;
629}
630
Nguyễn Thái Ngọc Duy4e99f2d2019-04-16 16:33:24 +0700631int repo_for_each_abbrev(struct repository *r, const char *prefix,
Eric W. Biederman52fca062023-10-01 21:40:07 -0500632 const struct git_hash_algo *algo,
Nguyễn Thái Ngọc Duy4e99f2d2019-04-16 16:33:24 +0700633 each_abbrev_fn fn, void *cb_data)
Junio C Hamano957d7402012-07-03 14:21:59 -0700634{
brian m. carlson910650d2017-03-31 01:40:00 +0000635 struct oid_array collect = OID_ARRAY_INIT;
Junio C Hamano957d7402012-07-03 14:21:59 -0700636 struct disambiguate_state ds;
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400637 int ret;
Junio C Hamano957d7402012-07-03 14:21:59 -0700638
Eric W. Biederman52fca062023-10-01 21:40:07 -0500639 if (init_object_disambiguation(r, prefix, strlen(prefix), algo, &ds) < 0)
Junio C Hamano957d7402012-07-03 14:21:59 -0700640 return -1;
641
Junio C Hamano957d7402012-07-03 14:21:59 -0700642 ds.always_call_fn = 1;
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700643 ds.fn = repo_collect_ambiguous;
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400644 ds.cb_data = &collect;
Jeff King00160432016-09-26 08:00:04 -0400645 find_short_object_filename(&ds);
646 find_short_packed_object(&ds);
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400647
brian m. carlson910650d2017-03-31 01:40:00 +0000648 ret = oid_array_for_each_unique(&collect, fn, cb_data);
649 oid_array_clear(&collect);
Jeff Kingfad6b9e2016-09-26 08:00:33 -0400650 return ret;
Junio C Hamano957d7402012-07-03 14:21:59 -0700651}
652
Jeff King8e3f52d2016-10-03 19:47:28 -0400653/*
654 * Return the slot of the most-significant bit set in "val". There are various
655 * ways to do this quickly with fls() or __builtin_clzl(), but speed is
656 * probably not a big deal here.
657 */
658static unsigned msb(unsigned long val)
659{
660 unsigned r = 0;
661 while (val >>= 1)
662 r++;
663 return r;
664}
665
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400666struct min_abbrev_data {
667 unsigned int init_len;
668 unsigned int cur_len;
669 char *hex;
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700670 struct repository *repo;
brian m. carlson626fd982018-03-22 13:40:08 -0400671 const struct object_id *oid;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400672};
673
Derrick Stoleea42d6fd2017-10-12 08:02:19 -0400674static inline char get_hex_char_from_oid(const struct object_id *oid,
675 unsigned int pos)
676{
677 static const char hex[] = "0123456789abcdef";
678
679 if ((pos & 1) == 0)
680 return hex[oid->hash[pos >> 1] >> 4];
681 else
682 return hex[oid->hash[pos >> 1] & 0xf];
683}
684
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400685static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
686{
687 struct min_abbrev_data *mad = cb_data;
688
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400689 unsigned int i = mad->init_len;
Derrick Stoleea42d6fd2017-10-12 08:02:19 -0400690 while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400691 i++;
692
693 if (i < GIT_MAX_RAWSZ && i >= mad->cur_len)
694 mad->cur_len = i + 1;
695
696 return 0;
697}
698
Jeff King07ffb952023-02-24 01:38:30 -0500699static int repo_extend_abbrev_len(struct repository *r UNUSED,
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700700 const struct object_id *oid,
701 void *cb_data)
702{
703 return extend_abbrev_len(oid, cb_data);
704}
705
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400706static void find_abbrev_len_for_midx(struct multi_pack_index *m,
707 struct min_abbrev_data *mad)
708{
709 int match = 0;
710 uint32_t num, first = 0;
711 struct object_id oid;
712 const struct object_id *mad_oid;
713
714 if (!m->num_objects)
715 return;
716
717 num = m->num_objects;
718 mad_oid = mad->oid;
719 match = bsearch_midx(mad_oid, m, &first);
720
721 /*
722 * first is now the position in the packfile where we would insert
723 * mad->hash if it does not exist (or the position of mad->hash if
724 * it does exist). Hence, we consider a maximum of two objects
725 * nearby for the abbreviation length.
726 */
727 mad->init_len = 0;
728 if (!match) {
729 if (nth_midxed_object_oid(&oid, m, first))
730 extend_abbrev_len(&oid, mad);
731 } else if (first < num - 1) {
732 if (nth_midxed_object_oid(&oid, m, first + 1))
733 extend_abbrev_len(&oid, mad);
734 }
735 if (first > 0) {
736 if (nth_midxed_object_oid(&oid, m, first - 1))
737 extend_abbrev_len(&oid, mad);
738 }
739 mad->init_len = mad->cur_len;
740}
741
Derrick Stolee0e87b852017-10-12 08:02:20 -0400742static void find_abbrev_len_for_pack(struct packed_git *p,
743 struct min_abbrev_data *mad)
744{
745 int match = 0;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400746 uint32_t num, first = 0;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400747 struct object_id oid;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400748 const struct object_id *mad_oid;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400749
Derrick Stoleeaf96fe32019-04-29 09:18:56 -0700750 if (p->multi_pack_index)
751 return;
752
Derrick Stolee0e87b852017-10-12 08:02:20 -0400753 if (open_pack_index(p) || !p->num_objects)
754 return;
755
756 num = p->num_objects;
Derrick Stolee0aaf05b2018-03-22 13:40:10 -0400757 mad_oid = mad->oid;
758 match = bsearch_pack(mad_oid, p, &first);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400759
760 /*
761 * first is now the position in the packfile where we would insert
762 * mad->hash if it does not exist (or the position of mad->hash if
Derrick Stolee21abed52018-02-27 06:47:04 -0500763 * it does exist). Hence, we consider a maximum of two objects
Derrick Stolee0e87b852017-10-12 08:02:20 -0400764 * nearby for the abbreviation length.
765 */
766 mad->init_len = 0;
767 if (!match) {
Jeff King07636712020-02-23 23:27:36 -0500768 if (!nth_packed_object_id(&oid, p, first))
Derrick Stolee21abed52018-02-27 06:47:04 -0500769 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400770 } else if (first < num - 1) {
Jeff King07636712020-02-23 23:27:36 -0500771 if (!nth_packed_object_id(&oid, p, first + 1))
Derrick Stolee21abed52018-02-27 06:47:04 -0500772 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400773 }
774 if (first > 0) {
Jeff King07636712020-02-23 23:27:36 -0500775 if (!nth_packed_object_id(&oid, p, first - 1))
Derrick Stolee21abed52018-02-27 06:47:04 -0500776 extend_abbrev_len(&oid, mad);
Derrick Stolee0e87b852017-10-12 08:02:20 -0400777 }
778 mad->init_len = mad->cur_len;
779}
780
781static void find_abbrev_len_packed(struct min_abbrev_data *mad)
782{
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400783 struct multi_pack_index *m;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400784 struct packed_git *p;
785
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700786 for (m = get_multi_pack_index(mad->repo); m; m = m->next)
Derrick Stolee8aac67a2018-07-12 15:39:35 -0400787 find_abbrev_len_for_midx(m, mad);
Nguyễn Thái Ngọc Duy7f07c032019-04-16 16:33:21 +0700788 for (p = get_packed_git(mad->repo); p; p = p->next)
Derrick Stolee0e87b852017-10-12 08:02:20 -0400789 find_abbrev_len_for_pack(p, mad);
790}
791
Calvin Wanf9401852023-06-06 19:48:41 +0000792void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
793 const struct object_id *oid, int abbrev_len)
794{
795 int r;
796 strbuf_grow(sb, GIT_MAX_HEXSZ + 1);
797 r = repo_find_unique_abbrev_r(repo, sb->buf + sb->len, oid, abbrev_len);
798 strbuf_setlen(sb, sb->len + r);
799}
800
801void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
802 int abbrev_len)
803{
804 strbuf_repo_add_unique_abbrev(sb, the_repository, oid, abbrev_len);
805}
806
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700807int repo_find_unique_abbrev_r(struct repository *r, char *hex,
808 const struct object_id *oid, int len)
Junio C Hamano013f2762005-10-11 15:22:48 -0700809{
Eric W. Biederman52fca062023-10-01 21:40:07 -0500810 const struct git_hash_algo *algo =
811 oid->algo ? &hash_algos[oid->algo] : r->hash_algo;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400812 struct disambiguate_state ds;
813 struct min_abbrev_data mad;
814 struct object_id oid_ret;
Eric W. Biederman52fca062023-10-01 21:40:07 -0500815 const unsigned hexsz = algo->hexsz;
brian m. carlson7b38efa2018-07-16 01:27:58 +0000816
Linus Torvaldse6c587c2016-09-30 17:19:37 -0700817 if (len < 0) {
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700818 unsigned long count = repo_approximate_object_count(r);
Jeff King8e3f52d2016-10-03 19:47:28 -0400819 /*
820 * Add one because the MSB only tells us the highest bit set,
821 * not including the value of all the _other_ bits (so "15"
822 * is only one off of 2^4, but the MSB is the 3rd bit.
823 */
824 len = msb(count) + 1;
825 /*
826 * We now know we have on the order of 2^len objects, which
827 * expects a collision at 2^(len/2). But we also care about hex
828 * chars, not bits, and there are 4 bits per hex. So all
René Scharfe42c78a22017-07-08 12:35:35 +0200829 * together we need to divide by 2 and round up.
Jeff King8e3f52d2016-10-03 19:47:28 -0400830 */
René Scharfe42c78a22017-07-08 12:35:35 +0200831 len = DIV_ROUND_UP(len, 2);
Jeff King8e3f52d2016-10-03 19:47:28 -0400832 /*
833 * For very small repos, we stick with our regular fallback.
834 */
835 if (len < FALLBACK_DEFAULT_ABBREV)
836 len = FALLBACK_DEFAULT_ABBREV;
Linus Torvaldse6c587c2016-09-30 17:19:37 -0700837 }
Jeff King8e3f52d2016-10-03 19:47:28 -0400838
brian m. carlsonaab95832018-03-12 02:27:30 +0000839 oid_to_hex_r(hex, oid);
Patrick Steinhardt037df602024-06-12 10:03:36 +0200840 if (len >= hexsz || !len)
brian m. carlson7b38efa2018-07-16 01:27:58 +0000841 return hexsz;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400842
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700843 mad.repo = r;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400844 mad.init_len = len;
845 mad.cur_len = len;
846 mad.hex = hex;
brian m. carlson626fd982018-03-22 13:40:08 -0400847 mad.oid = oid;
Derrick Stolee0e87b852017-10-12 08:02:20 -0400848
849 find_abbrev_len_packed(&mad);
850
Eric W. Biederman52fca062023-10-01 21:40:07 -0500851 if (init_object_disambiguation(r, hex, mad.cur_len, algo, &ds) < 0)
Derrick Stolee0e87b852017-10-12 08:02:20 -0400852 return -1;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400853
Nguyễn Thái Ngọc Duyef9b0372019-04-16 16:33:23 +0700854 ds.fn = repo_extend_abbrev_len;
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400855 ds.always_call_fn = 1;
856 ds.cb_data = (void *)&mad;
857
858 find_short_object_filename(&ds);
Derrick Stolee5b20ace2017-10-08 14:49:40 -0400859 (void)finish_object_disambiguation(&ds, &oid_ret);
860
861 hex[mad.cur_len] = 0;
862 return mad.cur_len;
Jeff Kingaf49c6d2015-09-24 17:05:45 -0400863}
864
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700865const char *repo_find_unique_abbrev(struct repository *r,
866 const struct object_id *oid,
867 int len)
Jeff Kingaf49c6d2015-09-24 17:05:45 -0400868{
Jeff Kingef2ed502016-10-20 02:19:19 -0400869 static int bufno;
brian m. carlsondc015052017-03-26 16:01:24 +0000870 static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
René Scharfe3e989192016-11-01 09:49:07 +0100871 char *hex = hexbuffer[bufno];
872 bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
Nguyễn Thái Ngọc Duy8bb95572019-04-16 16:33:22 +0700873 repo_find_unique_abbrev_r(r, hex, oid, len);
Junio C Hamanob66fde92008-03-01 23:35:32 -0800874 return hex;
Junio C Hamano9938af62005-08-03 22:15:49 -0700875}
876
Junio C Hamano6677c462005-12-15 12:54:00 -0800877static int ambiguous_path(const char *path, int len)
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700878{
879 int slash = 1;
Junio C Hamano6677c462005-12-15 12:54:00 -0800880 int cnt;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700881
Junio C Hamano6677c462005-12-15 12:54:00 -0800882 for (cnt = 0; cnt < len; cnt++) {
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700883 switch (*path++) {
884 case '\0':
885 break;
886 case '/':
887 if (slash)
888 break;
889 slash = 1;
890 continue;
891 case '.':
892 continue;
893 default:
894 slash = 0;
895 continue;
896 }
Junio C Hamanoc054d642005-12-17 00:00:50 -0800897 break;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700898 }
Junio C Hamano6677c462005-12-15 12:54:00 -0800899 return slash;
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700900}
901
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400902static inline int at_mark(const char *string, int len,
903 const char **suffix, int nr)
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800904{
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800905 int i;
906
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400907 for (i = 0; i < nr; i++) {
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800908 int suffix_len = strlen(suffix[i]);
909 if (suffix_len <= len
Ævar Arnfjörð Bjarmason244ea1b2017-03-27 11:16:55 +0000910 && !strncasecmp(string, suffix[i], suffix_len))
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -0800911 return suffix_len;
912 }
913 return 0;
914}
915
Jeff Kinga1ad0eb2015-05-21 00:45:39 -0400916static inline int upstream_mark(const char *string, int len)
917{
918 const char *suffix[] = { "@{upstream}", "@{u}" };
919 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
920}
921
Jeff Kingadfe5d02015-05-21 00:45:47 -0400922static inline int push_mark(const char *string, int len)
923{
924 const char *suffix[] = { "@{push}" };
925 return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
926}
927
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +0700928static 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 +0700929static int interpret_nth_prior_checkout(struct repository *r, const char *name, int namelen, struct strbuf *buf);
Thomas Rastd18ba222009-01-17 17:09:55 +0100930
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700931static int get_oid_basic(struct repository *r, const char *str, int len,
932 struct object_id *oid, unsigned int flags)
Junio C Hamanoe86eb662007-01-19 01:15:15 -0800933{
Jon Seymoureedce782010-08-24 14:52:43 +1000934 static const char *warn_msg = "refname '%.*s' is ambiguous.";
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700935 static const char *object_name_msg = N_(
936 "Git normally never creates a ref that ends with 40 hex characters\n"
937 "because it will be ignored when you just specify 40-hex. These refs\n"
938 "may be created by mistake. For example,\n"
939 "\n"
Nguyễn Thái Ngọc Duy328c6cb2019-03-29 17:39:19 +0700940 " git switch -c $br $(git rev-parse ...)\n"
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700941 "\n"
942 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
943 "examine these refs and maybe delete them. Turn this message off by\n"
Thomas Rast8dc84fd2013-07-31 22:23:31 +0200944 "running \"git config advice.objectNameWarning false\"");
brian m. carlsone82caf32017-07-13 23:49:28 +0000945 struct object_id tmp_oid;
Linus Torvaldsed378ec2006-09-11 20:17:35 -0700946 char *real_ref = NULL;
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700947 int refs_found = 0;
Felipe Contreras128fd542013-05-07 16:55:10 -0500948 int at, reflog_len, nth_prior = 0;
Felipe Contrerasdfbfdc52023-03-16 11:15:14 -0600949 int fatal = !(flags & GET_OID_QUIETLY);
Junio C Hamano9938af62005-08-03 22:15:49 -0700950
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700951 if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {
Brodie Rao832cf742014-01-06 19:32:01 -0800952 if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
Jonathan Tanf24c30e2020-09-01 15:28:09 -0700953 refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0);
Brodie Rao832cf742014-01-06 19:32:01 -0800954 if (refs_found > 0) {
Jeff King25fba782013-07-12 02:20:05 -0400955 warning(warn_msg, len, str);
Ben Boeckeled9bff02021-08-23 12:44:00 +0200956 if (advice_enabled(ADVICE_OBJECT_NAME_WARNING))
Jeff King25fba782013-07-12 02:20:05 -0400957 fprintf(stderr, "%s\n", _(object_name_msg));
958 }
959 free(real_ref);
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700960 }
Junio C Hamano9938af62005-08-03 22:15:49 -0700961 return 0;
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +0700962 }
Junio C Hamano9938af62005-08-03 22:15:49 -0700963
Thomas Rastd18ba222009-01-17 17:09:55 +0100964 /* basic@{time or number or -number} format to query ref-log */
Junio C Hamano694500e2006-10-23 21:15:34 -0700965 reflog_len = at = 0;
Johannes Schindelinf2654582009-01-28 00:07:46 +0100966 if (len && str[len-1] == '}') {
Ramkumar Ramachandrae883a052013-05-07 16:55:09 -0500967 for (at = len-4; at >= 0; at--) {
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700968 if (str[at] == '@' && str[at+1] == '{') {
Ramkumar Ramachandra83d16bc2013-05-07 16:55:11 -0500969 if (str[at+2] == '-') {
970 if (at != 0)
971 /* @{-N} not at start */
972 return -1;
Felipe Contreras128fd542013-05-07 16:55:10 -0500973 nth_prior = 1;
974 continue;
975 }
Jeff Kingadfe5d02015-05-21 00:45:47 -0400976 if (!upstream_mark(str + at, len - at) &&
977 !push_mark(str + at, len - at)) {
Johannes Schindelin28fb8432009-09-10 17:25:57 +0200978 reflog_len = (len-1) - (at+2);
979 len = at;
980 }
Junio C Hamanoab2a1a32006-10-05 23:16:15 -0700981 break;
982 }
Shawn Pearced556fae2006-05-17 05:56:09 -0400983 }
984 }
985
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700986 /* Accept only unambiguous ref paths. */
Nicolas Pitre11cf8802007-02-01 17:29:33 -0500987 if (len && ambiguous_path(str, len))
Linus Torvaldsaf13cdf2005-10-28 12:41:49 -0700988 return -1;
989
Felipe Contreras128fd542013-05-07 16:55:10 -0500990 if (nth_prior) {
Thomas Rastd18ba222009-01-17 17:09:55 +0100991 struct strbuf buf = STRBUF_INIT;
Felipe Contreras128fd542013-05-07 16:55:10 -0500992 int detached;
993
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +0700994 if (interpret_nth_prior_checkout(r, str, len, &buf) > 0) {
995 detached = (buf.len == r->hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
Felipe Contreras128fd542013-05-07 16:55:10 -0500996 strbuf_release(&buf);
997 if (detached)
998 return 0;
Thomas Rastd18ba222009-01-17 17:09:55 +0100999 }
Felipe Contreras128fd542013-05-07 16:55:10 -05001000 }
1001
1002 if (!len && reflog_len)
Nicolas Pitre11cf8802007-02-01 17:29:33 -05001003 /* allow "@{...}" to mean the current branch reflog */
Felipe Contrerasdfbfdc52023-03-16 11:15:14 -06001004 refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref, !fatal);
Felipe Contreras128fd542013-05-07 16:55:10 -05001005 else if (reflog_len)
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +07001006 refs_found = repo_dwim_log(r, str, len, oid, &real_ref);
Nicolas Pitref2eba662007-02-03 21:49:16 -05001007 else
Felipe Contrerasdfbfdc52023-03-16 11:15:14 -06001008 refs_found = repo_dwim_ref(r, str, len, oid, &real_ref, !fatal);
Shawn Pearced556fae2006-05-17 05:56:09 -04001009
1010 if (!refs_found)
1011 return -1;
1012
brian m. carlson321c89b2017-07-13 23:49:29 +00001013 if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
Nguyễn Thái Ngọc Duy798c35f2013-05-29 19:12:42 +07001014 (refs_found > 1 ||
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +07001015 !get_short_oid(r, str, len, &tmp_oid, GET_OID_QUIETLY)))
Jon Seymoureedce782010-08-24 14:52:43 +10001016 warning(warn_msg, len, str);
Shawn Pearced556fae2006-05-17 05:56:09 -04001017
Junio C Hamanoab2a1a32006-10-05 23:16:15 -07001018 if (reflog_len) {
Junio C Hamanoab2a1a32006-10-05 23:16:15 -07001019 int nth, i;
Johannes Schindelindddbad72017-04-26 21:29:31 +02001020 timestamp_t at_time;
1021 timestamp_t co_time;
Junio C Hamano16d7cc92007-01-19 01:19:05 -08001022 int co_tz, co_cnt;
1023
Nicolas Pitrefe558512007-02-01 12:33:23 -05001024 /* Is it asking for N-th entry, or approxidate? */
Junio C Hamanoab2a1a32006-10-05 23:16:15 -07001025 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
1026 char ch = str[at+2+i];
1027 if ('0' <= ch && ch <= '9')
1028 nth = nth * 10 + ch - '0';
1029 else
1030 nth = -1;
1031 }
Shawn O. Pearceea360dd2008-08-21 08:40:44 -07001032 if (100000000 <= nth) {
1033 at_time = nth;
1034 nth = -1;
1035 } else if (0 <= nth)
Junio C Hamanoab2a1a32006-10-05 23:16:15 -07001036 at_time = 0;
Jeff King861f00e2008-04-30 00:13:58 -04001037 else {
Junio C Hamano93cfa7c2010-01-26 11:58:00 -08001038 int errors = 0;
Jeff King861f00e2008-04-30 00:13:58 -04001039 char *tmp = xstrndup(str + at + 2, reflog_len);
Junio C Hamano93cfa7c2010-01-26 11:58:00 -08001040 at_time = approxidate_careful(tmp, &errors);
Jeff King861f00e2008-04-30 00:13:58 -04001041 free(tmp);
Jeff King28b35632014-07-24 00:41:11 -04001042 if (errors) {
1043 free(real_ref);
Junio C Hamanoa5e10ac2010-01-27 10:53:09 -08001044 return -1;
Jeff King28b35632014-07-24 00:41:11 -04001045 }
Jeff King861f00e2008-04-30 00:13:58 -04001046 }
Nguyễn Thái Ngọc Duy49281cf2019-04-16 16:33:31 +07001047 if (read_ref_at(get_main_ref_store(r),
Nguyễn Thái Ngọc Duy7fdff472019-04-06 18:34:30 +07001048 real_ref, flags, at_time, nth, oid, NULL,
Junio C Hamano16d7cc92007-01-19 01:19:05 -08001049 &co_time, &co_tz, &co_cnt)) {
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +05301050 if (!len) {
Junio C Hamano145136a2020-01-30 11:35:46 -08001051 if (!skip_prefix(real_ref, "refs/heads/", &str))
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +05301052 str = "HEAD";
Junio C Hamano145136a2020-01-30 11:35:46 -08001053 len = strlen(str);
Ramkumar Ramachandra305ebea2013-05-22 16:09:55 +05301054 }
David Aguilarc41a87d2014-09-18 20:45:37 -07001055 if (at_time) {
brian m. carlson321c89b2017-07-13 23:49:29 +00001056 if (!(flags & GET_OID_QUIETLY)) {
Jeff Kingb0418302020-01-24 19:13:01 -05001057 warning(_("log for '%.*s' only goes back to %s"),
1058 len, str,
Jeff Kinga5481a62015-06-25 12:55:02 -04001059 show_date(co_time, co_tz, DATE_MODE(RFC2822)));
David Aguilarc41a87d2014-09-18 20:45:37 -07001060 }
Jeff King755e7462024-02-26 05:04:07 -05001061 } else if (nth == co_cnt && !is_null_oid(oid)) {
1062 /*
1063 * We were asked for the Nth reflog (counting
1064 * from 0), but there were only N entries.
1065 * read_ref_at() will have returned "1" to tell
1066 * us it did not find an entry, but it did
1067 * still fill in the oid with the "old" value,
1068 * which we can use.
1069 */
David Aguilarc41a87d2014-09-18 20:45:37 -07001070 } else {
brian m. carlson321c89b2017-07-13 23:49:29 +00001071 if (flags & GET_OID_QUIETLY) {
David Aguilarc41a87d2014-09-18 20:45:37 -07001072 exit(128);
1073 }
Jeff Kingb0418302020-01-24 19:13:01 -05001074 die(_("log for '%.*s' only has %d entries"),
Jon Seymoure6eedc32010-08-24 14:52:42 +10001075 len, str, co_cnt);
1076 }
Junio C Hamano16d7cc92007-01-19 01:19:05 -08001077 }
Shawn Pearced556fae2006-05-17 05:56:09 -04001078 }
1079
Linus Torvaldsed378ec2006-09-11 20:17:35 -07001080 free(real_ref);
Shawn Pearced556fae2006-05-17 05:56:09 -04001081 return 0;
Junio C Hamano9938af62005-08-03 22:15:49 -07001082}
1083
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001084static enum get_oid_result get_parent(struct repository *r,
1085 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -05001086 struct object_id *result, int idx)
Junio C Hamano9938af62005-08-03 22:15:49 -07001087{
brian m. carlson1e43ed92017-05-06 22:10:09 +00001088 struct object_id oid;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001089 enum get_oid_result ret = get_oid_1(r, name, len, &oid,
David Turnerd1dd94b2019-01-17 23:19:43 -05001090 GET_OID_COMMITTISH);
Junio C Hamano9938af62005-08-03 22:15:49 -07001091 struct commit *commit;
1092 struct commit_list *p;
1093
1094 if (ret)
1095 return ret;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001096 commit = lookup_commit_reference(r, &oid);
Ævar Arnfjörð Bjarmason4a93b892023-03-28 15:58:58 +02001097 if (repo_parse_commit(r, commit))
David Turnerd1dd94b2019-01-17 23:19:43 -05001098 return MISSING_OBJECT;
Junio C Hamano9938af62005-08-03 22:15:49 -07001099 if (!idx) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001100 oidcpy(result, &commit->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -05001101 return FOUND;
Junio C Hamano9938af62005-08-03 22:15:49 -07001102 }
1103 p = commit->parents;
1104 while (p) {
1105 if (!--idx) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001106 oidcpy(result, &p->item->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -05001107 return FOUND;
Junio C Hamano9938af62005-08-03 22:15:49 -07001108 }
1109 p = p->next;
1110 }
David Turnerd1dd94b2019-01-17 23:19:43 -05001111 return MISSING_OBJECT;
Junio C Hamano9938af62005-08-03 22:15:49 -07001112}
1113
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001114static enum get_oid_result get_nth_ancestor(struct repository *r,
1115 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -05001116 struct object_id *result,
1117 int generation)
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001118{
brian m. carlson1e43ed92017-05-06 22:10:09 +00001119 struct object_id oid;
Linus Torvalds621ff672008-03-14 11:49:40 -07001120 struct commit *commit;
1121 int ret;
1122
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001123 ret = get_oid_1(r, name, len, &oid, GET_OID_COMMITTISH);
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001124 if (ret)
1125 return ret;
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001126 commit = lookup_commit_reference(r, &oid);
Linus Torvalds621ff672008-03-14 11:49:40 -07001127 if (!commit)
David Turnerd1dd94b2019-01-17 23:19:43 -05001128 return MISSING_OBJECT;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001129
1130 while (generation--) {
Ævar Arnfjörð Bjarmason4a93b892023-03-28 15:58:58 +02001131 if (repo_parse_commit(r, commit) || !commit->parents)
David Turnerd1dd94b2019-01-17 23:19:43 -05001132 return MISSING_OBJECT;
Linus Torvalds621ff672008-03-14 11:49:40 -07001133 commit = commit->parents->item;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001134 }
brian m. carlsone82caf32017-07-13 23:49:28 +00001135 oidcpy(result, &commit->object.oid);
David Turnerd1dd94b2019-01-17 23:19:43 -05001136 return FOUND;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001137}
1138
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001139struct object *repo_peel_to_type(struct repository *r, const char *name, int namelen,
1140 struct object *o, enum object_type expected_type)
Junio C Hamano81776312007-12-24 00:51:01 -08001141{
1142 if (name && !namelen)
1143 namelen = strlen(name);
Junio C Hamano81776312007-12-24 00:51:01 -08001144 while (1) {
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001145 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
Junio C Hamano81776312007-12-24 00:51:01 -08001146 return NULL;
Junio C Hamanoa6a3f2c2013-03-31 15:24:12 -07001147 if (expected_type == OBJ_ANY || o->type == expected_type)
Junio C Hamano81776312007-12-24 00:51:01 -08001148 return o;
1149 if (o->type == OBJ_TAG)
1150 o = ((struct tag*) o)->tagged;
1151 else if (o->type == OBJ_COMMIT)
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001152 o = &(repo_get_commit_tree(r, ((struct commit *)o))->object);
Junio C Hamano81776312007-12-24 00:51:01 -08001153 else {
1154 if (name)
1155 error("%.*s: expected %s type, but the object "
1156 "dereferences to %s type",
Brandon Williamsdebca9d2018-02-14 10:59:24 -08001157 namelen, name, type_name(expected_type),
1158 type_name(o->type));
Junio C Hamano81776312007-12-24 00:51:01 -08001159 return NULL;
1160 }
1161 }
1162}
1163
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001164static int peel_onion(struct repository *r, const char *name, int len,
1165 struct object_id *oid, unsigned lookup_flags)
Junio C Hamano5385f522005-10-13 18:57:40 -07001166{
brian m. carlsonde37d502017-05-06 22:10:29 +00001167 struct object_id outer;
Junio C Hamano5385f522005-10-13 18:57:40 -07001168 const char *sp;
Linus Torvalds885a86a2006-06-14 16:45:13 -07001169 unsigned int expected_type = 0;
Junio C Hamano5385f522005-10-13 18:57:40 -07001170 struct object *o;
1171
1172 /*
1173 * "ref^{type}" dereferences ref repeatedly until you cannot
1174 * dereference anymore, or you get an object of given type,
1175 * whichever comes first. "ref^{}" means just dereference
1176 * tags until you get a non-tag. "ref^0" is a shorthand for
1177 * "ref^{commit}". "commit^{tree}" could be used to find the
1178 * top-level tree of the given commit.
1179 */
1180 if (len < 4 || name[len-1] != '}')
1181 return -1;
1182
1183 for (sp = name + len - 1; name <= sp; sp--) {
1184 int ch = *sp;
1185 if (ch == '{' && name < sp && sp[-1] == '^')
1186 break;
1187 }
1188 if (sp <= name)
1189 return -1;
1190
1191 sp++; /* beginning of type name, or closing brace for empty */
Christian Couder59556542013-11-30 21:55:40 +01001192 if (starts_with(sp, "commit}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001193 expected_type = OBJ_COMMIT;
Christian Couder59556542013-11-30 21:55:40 +01001194 else if (starts_with(sp, "tag}"))
Richard Hansen75aa26d2013-09-03 15:50:16 -04001195 expected_type = OBJ_TAG;
Christian Couder59556542013-11-30 21:55:40 +01001196 else if (starts_with(sp, "tree}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001197 expected_type = OBJ_TREE;
Christian Couder59556542013-11-30 21:55:40 +01001198 else if (starts_with(sp, "blob}"))
Linus Torvalds19746322006-07-11 20:45:31 -07001199 expected_type = OBJ_BLOB;
Christian Couder59556542013-11-30 21:55:40 +01001200 else if (starts_with(sp, "object}"))
Junio C Hamanoa6a3f2c2013-03-31 15:24:12 -07001201 expected_type = OBJ_ANY;
Junio C Hamano5385f522005-10-13 18:57:40 -07001202 else if (sp[0] == '}')
Linus Torvalds19746322006-07-11 20:45:31 -07001203 expected_type = OBJ_NONE;
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001204 else if (sp[0] == '/')
1205 expected_type = OBJ_COMMIT;
Junio C Hamano5385f522005-10-13 18:57:40 -07001206 else
1207 return -1;
1208
brian m. carlson321c89b2017-07-13 23:49:29 +00001209 lookup_flags &= ~GET_OID_DISAMBIGUATORS;
Junio C Hamanoe2643612012-07-02 10:00:40 -07001210 if (expected_type == OBJ_COMMIT)
brian m. carlson321c89b2017-07-13 23:49:29 +00001211 lookup_flags |= GET_OID_COMMITTISH;
Junio C Hamanoed1ca602013-03-31 15:19:52 -07001212 else if (expected_type == OBJ_TREE)
brian m. carlson321c89b2017-07-13 23:49:29 +00001213 lookup_flags |= GET_OID_TREEISH;
Junio C Hamanoe2643612012-07-02 10:00:40 -07001214
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001215 if (get_oid_1(r, name, sp - name - 2, &outer, lookup_flags))
Junio C Hamano5385f522005-10-13 18:57:40 -07001216 return -1;
1217
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001218 o = parse_object(r, &outer);
Junio C Hamano5385f522005-10-13 18:57:40 -07001219 if (!o)
1220 return -1;
Linus Torvalds885a86a2006-06-14 16:45:13 -07001221 if (!expected_type) {
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001222 o = deref_tag(r, o, name, sp - name - 2);
1223 if (!o || (!o->parsed && !parse_object(r, &o->oid)))
Junio C Hamano6e1c6c12005-10-19 22:48:16 -07001224 return -1;
brian m. carlsone82caf32017-07-13 23:49:28 +00001225 oidcpy(oid, &o->oid);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001226 return 0;
Junio C Hamano5385f522005-10-13 18:57:40 -07001227 }
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001228
1229 /*
1230 * At this point, the syntax look correct, so
1231 * if we do not get the needed object, we should
1232 * barf.
1233 */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001234 o = repo_peel_to_type(r, name, len, o, expected_type);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001235 if (!o)
Junio C Hamano81776312007-12-24 00:51:01 -08001236 return -1;
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001237
brian m. carlsone82caf32017-07-13 23:49:28 +00001238 oidcpy(oid, &o->oid);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001239 if (sp[0] == '/') {
1240 /* "$commit^{/foo}" */
1241 char *prefix;
1242 int ret;
1243 struct commit_list *list = NULL;
1244
Nguyễn Thái Ngọc Duy43228422010-12-15 16:02:54 +07001245 /*
1246 * $commit^{/}. Some regex implementation may reject.
1247 * We don't need regex anyway. '' pattern always matches.
1248 */
1249 if (sp[1] == '}')
1250 return 0;
1251
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001252 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
1253 commit_list_insert((struct commit *)o, &list);
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001254 ret = get_oid_oneline(r, prefix, oid, list);
Nguyễn Thái Ngọc Duy32574b62010-12-13 10:01:15 +07001255 free(prefix);
1256 return ret;
Junio C Hamano5385f522005-10-13 18:57:40 -07001257 }
1258 return 0;
1259}
1260
Nguyễn Thái Ngọc Duy0c6b5ba2019-04-16 16:33:30 +07001261static int get_describe_name(struct repository *r,
1262 const char *name, int len,
1263 struct object_id *oid)
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001264{
1265 const char *cp;
brian m. carlson321c89b2017-07-13 23:49:29 +00001266 unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001267
1268 for (cp = name + len - 1; name + 2 <= cp; cp--) {
1269 char ch = *cp;
René Scharfe6f75d452015-03-09 23:46:54 +01001270 if (!isxdigit(ch)) {
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001271 /* We must be looking at g in "SOMETHING-g"
1272 * for it to be describe output.
1273 */
1274 if (ch == 'g' && cp[-1] == '-') {
1275 cp++;
1276 len -= cp - name;
Nguyễn Thái Ngọc Duy0c6b5ba2019-04-16 16:33:30 +07001277 return get_short_oid(r,
Nguyễn Thái Ngọc Duyc6c02352019-04-16 16:33:25 +07001278 cp, len, oid, flags);
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001279 }
1280 }
1281 }
1282 return -1;
1283}
1284
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001285static enum get_oid_result get_oid_1(struct repository *r,
1286 const char *name, int len,
David Turnerd1dd94b2019-01-17 23:19:43 -05001287 struct object_id *oid,
1288 unsigned lookup_flags)
Junio C Hamano9938af62005-08-03 22:15:49 -07001289{
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001290 int ret, has_suffix;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001291 const char *cp;
Junio C Hamano9938af62005-08-03 22:15:49 -07001292
Linus Torvalds621ff672008-03-14 11:49:40 -07001293 /*
1294 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001295 */
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001296 has_suffix = 0;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001297 for (cp = name + len - 1; name <= cp; cp--) {
1298 int ch = *cp;
1299 if ('0' <= ch && ch <= '9')
1300 continue;
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001301 if (ch == '~' || ch == '^')
1302 has_suffix = ch;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001303 break;
1304 }
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001305
1306 if (has_suffix) {
René Scharfe59fa5f52019-09-15 14:10:28 +02001307 unsigned int num = 0;
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001308 int len1 = cp - name;
1309 cp++;
René Scharfe59fa5f52019-09-15 14:10:28 +02001310 while (cp < name + len) {
1311 unsigned int digit = *cp++ - '0';
1312 if (unsigned_mult_overflows(num, 10))
1313 return MISSING_OBJECT;
1314 num *= 10;
1315 if (unsigned_add_overflows(num, digit))
1316 return MISSING_OBJECT;
1317 num += digit;
1318 }
Linus Torvalds621ff672008-03-14 11:49:40 -07001319 if (!num && len1 == len - 1)
1320 num = 1;
René Scharfe59fa5f52019-09-15 14:10:28 +02001321 else if (num > INT_MAX)
1322 return MISSING_OBJECT;
Linus Torvalds621ff672008-03-14 11:49:40 -07001323 if (has_suffix == '^')
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001324 return get_parent(r, name, len1, oid, num);
Junio C Hamano0601dbe2006-02-02 23:48:36 -08001325 /* else if (has_suffix == '~') -- goes without saying */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001326 return get_nth_ancestor(r, name, len1, oid, num);
Junio C Hamano4f7599a2005-08-21 02:43:54 -07001327 }
1328
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001329 ret = peel_onion(r, name, len, oid, lookup_flags);
Junio C Hamano5385f522005-10-13 18:57:40 -07001330 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001331 return FOUND;
Junio C Hamano5385f522005-10-13 18:57:40 -07001332
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001333 ret = get_oid_basic(r, name, len, oid, lookup_flags);
Junio C Hamano9938af62005-08-03 22:15:49 -07001334 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001335 return FOUND;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001336
1337 /* It could be describe output that is "SOMETHING-gXXXX" */
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001338 ret = get_describe_name(r, name, len, oid);
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001339 if (!ret)
David Turnerd1dd94b2019-01-17 23:19:43 -05001340 return FOUND;
Junio C Hamano7dd45e12006-09-20 16:11:08 -07001341
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001342 return get_short_oid(r, name, len, oid, lookup_flags);
Junio C Hamano9938af62005-08-03 22:15:49 -07001343}
1344
Junio C Hamanof7bff002010-08-02 14:37:06 -07001345/*
1346 * This interprets names like ':/Initial revision of "git"' by searching
1347 * through history and returning the first commit whose message starts
Junio C Hamano3d045892010-08-12 18:32:49 -07001348 * the given regular expression.
Junio C Hamanof7bff002010-08-02 14:37:06 -07001349 *
Will Palmer07698542016-01-30 17:06:01 -07001350 * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'.
1351 *
1352 * For a literal '!' character at the beginning of a pattern, you have to repeat
1353 * that, like: ':/!!foo'
1354 *
1355 * For future extension, all other sequences beginning with ':/!' are reserved.
Junio C Hamanof7bff002010-08-02 14:37:06 -07001356 */
Nguyễn Thái Ngọc Duy208acbf2014-03-25 20:23:26 +07001357
1358/* Remember to update object flag allocation in object.h */
Junio C Hamanof7bff002010-08-02 14:37:06 -07001359#define ONELINE_SEEN (1u<<20)
1360
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001361struct handle_one_ref_cb {
1362 struct repository *repo;
1363 struct commit_list **list;
1364};
1365
Michael Haggerty9c5fe0b2015-05-25 18:39:05 +00001366static int handle_one_ref(const char *path, const struct object_id *oid,
Ævar Arnfjörð Bjarmason5cf88fd2022-08-25 19:09:48 +02001367 int flag UNUSED,
Jeff King63e14ee2022-08-19 06:08:32 -04001368 void *cb_data)
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001369{
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001370 struct handle_one_ref_cb *cb = cb_data;
1371 struct commit_list **list = cb->list;
1372 struct object *object = parse_object(cb->repo, oid);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001373 if (!object)
1374 return 0;
Martin Koegleraffeef12008-02-18 08:31:54 +01001375 if (object->type == OBJ_TAG) {
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07001376 object = deref_tag(cb->repo, object, path,
Stefan Bellera74093d2018-06-28 18:22:05 -07001377 strlen(path));
Martin Koegleraffeef12008-02-18 08:31:54 +01001378 if (!object)
1379 return 0;
1380 }
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001381 if (object->type != OBJ_COMMIT)
1382 return 0;
René Scharfee8d1dfe2014-08-21 20:30:29 +02001383 commit_list_insert((struct commit *)object, list);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001384 return 0;
1385}
1386
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001387static int get_oid_oneline(struct repository *r,
1388 const char *prefix, struct object_id *oid,
1389 struct commit_list *list)
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001390{
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001391 struct commit_list *backup = NULL, *l;
Junio C Hamano28042db2010-12-12 22:19:00 -08001392 int found = 0;
Will Palmer07698542016-01-30 17:06:01 -07001393 int negative = 0;
Linus Torvalds57895102010-04-23 08:20:20 -07001394 regex_t regex;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001395
1396 if (prefix[0] == '!') {
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001397 prefix++;
Will Palmer07698542016-01-30 17:06:01 -07001398
1399 if (prefix[0] == '-') {
1400 prefix++;
1401 negative = 1;
1402 } else if (prefix[0] != '!') {
Junio C Hamanoe6a6a762016-02-24 13:25:52 -08001403 return -1;
Will Palmer07698542016-01-30 17:06:01 -07001404 }
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001405 }
Linus Torvalds57895102010-04-23 08:20:20 -07001406
1407 if (regcomp(&regex, prefix, REG_EXTENDED))
Jeff Kingaac4fac2016-02-10 16:19:25 -05001408 return -1;
Linus Torvalds57895102010-04-23 08:20:20 -07001409
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001410 for (l = list; l; l = l->next) {
1411 l->item->object.flags |= ONELINE_SEEN;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001412 commit_list_insert(l->item, &backup);
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07001413 }
Jim Meyeringed8ad7e2007-03-11 19:49:08 +01001414 while (list) {
Jeff Kingba41c1c2014-06-10 17:41:02 -04001415 const char *p, *buf;
Linus Torvalds1358e7d2007-03-12 11:30:38 -07001416 struct commit *commit;
Junio C Hamano28042db2010-12-12 22:19:00 -08001417 int matches;
Jim Meyeringed8ad7e2007-03-11 19:49:08 +01001418
1419 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07001420 if (!parse_object(r, &commit->object.oid))
Martin Koegler283cdbc2008-02-18 21:47:53 +01001421 continue;
Ævar Arnfjörð Bjarmason4a93b892023-03-28 15:58:58 +02001422 buf = repo_get_commit_buffer(r, commit, NULL);
Jeff Kingba41c1c2014-06-10 17:41:02 -04001423 p = strstr(buf, "\n\n");
Will Palmer07698542016-01-30 17:06:01 -07001424 matches = negative ^ (p && !regexec(&regex, p + 2, 0, NULL, 0));
Ævar Arnfjörð Bjarmason4a93b892023-03-28 15:58:58 +02001425 repo_unuse_commit_buffer(r, commit, buf);
Junio C Hamano28042db2010-12-12 22:19:00 -08001426
1427 if (matches) {
brian m. carlsone82caf32017-07-13 23:49:28 +00001428 oidcpy(oid, &commit->object.oid);
Junio C Hamano28042db2010-12-12 22:19:00 -08001429 found = 1;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001430 break;
1431 }
1432 }
Linus Torvalds57895102010-04-23 08:20:20 -07001433 regfree(&regex);
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001434 free_commit_list(list);
1435 for (l = backup; l; l = l->next)
1436 clear_commit_marks(l->item, ONELINE_SEEN);
Junio C Hamano28042db2010-12-12 22:19:00 -08001437 free_commit_list(backup);
1438 return found ? 0 : -1;
Johannes Schindelin28a4d942007-02-24 03:08:20 +01001439}
1440
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001441struct grab_nth_branch_switch_cbdata {
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001442 int remaining;
René Scharfe4b3aa172019-09-18 18:35:38 +02001443 struct strbuf *sb;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001444};
1445
Ævar Arnfjörð Bjarmason5cf88fd2022-08-25 19:09:48 +02001446static int grab_nth_branch_switch(struct object_id *ooid UNUSED,
1447 struct object_id *noid UNUSED,
1448 const char *email UNUSED,
1449 timestamp_t timestamp UNUSED,
1450 int tz UNUSED,
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001451 const char *message, void *cb_data)
1452{
1453 struct grab_nth_branch_switch_cbdata *cb = cb_data;
Thomas Rasta884d0c2009-01-17 17:09:54 +01001454 const char *match = NULL, *target = NULL;
1455 size_t len;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001456
Jeff King95b567c2014-06-18 15:48:29 -04001457 if (skip_prefix(message, "checkout: moving from ", &match))
Junio C Hamanod7c03c12009-01-21 00:37:38 -08001458 target = strstr(match, " to ");
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001459
Junio C Hamanoc8297742009-01-19 16:44:08 -08001460 if (!match || !target)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001461 return 0;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001462 if (--(cb->remaining) == 0) {
1463 len = target - match;
René Scharfe4b3aa172019-09-18 18:35:38 +02001464 strbuf_reset(cb->sb);
1465 strbuf_add(cb->sb, match, len);
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001466 return 1; /* we are done */
1467 }
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001468 return 0;
1469}
1470
1471/*
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001472 * Parse @{-N} syntax, return the number of characters parsed
1473 * if successful; otherwise signal an error with negative value.
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001474 */
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001475static int interpret_nth_prior_checkout(struct repository *r,
1476 const char *name, int namelen,
Jeff King8cd42492014-01-15 03:31:57 -05001477 struct strbuf *buf)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001478{
Junio C Hamanoc2883e62009-01-19 00:04:25 -08001479 long nth;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001480 int retval;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001481 struct grab_nth_branch_switch_cbdata cb;
Thomas Rasta884d0c2009-01-17 17:09:54 +01001482 const char *brace;
1483 char *num_end;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001484
Jeff King8cd42492014-01-15 03:31:57 -05001485 if (namelen < 4)
1486 return -1;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001487 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
1488 return -1;
Jeff King8cd42492014-01-15 03:31:57 -05001489 brace = memchr(name, '}', namelen);
Thomas Rasta884d0c2009-01-17 17:09:54 +01001490 if (!brace)
1491 return -1;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001492 nth = strtol(name + 3, &num_end, 10);
Thomas Rasta884d0c2009-01-17 17:09:54 +01001493 if (num_end != brace)
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001494 return -1;
Junio C Hamanoc2883e62009-01-19 00:04:25 -08001495 if (nth <= 0)
1496 return -1;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001497 cb.remaining = nth;
René Scharfe4b3aa172019-09-18 18:35:38 +02001498 cb.sb = buf;
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001499
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001500 retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r),
1501 "HEAD", grab_nth_branch_switch, &cb);
1502 if (0 < retval) {
Junio C Hamano98f85ff2013-03-08 13:27:37 -08001503 retval = brace - name + 1;
Nguyễn Thái Ngọc Duy23a57122019-04-16 16:33:26 +07001504 } else
1505 retval = 0;
Junio C Hamano39765e52009-01-19 21:58:31 -08001506
Junio C Hamano39765e52009-01-19 21:58:31 -08001507 return retval;
Junio C Hamanoae5a6c32009-01-17 17:09:53 +01001508}
1509
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001510int repo_get_oid_mb(struct repository *r,
1511 const char *name,
1512 struct object_id *oid)
Junio C Hamano619a6442009-10-18 12:34:56 -07001513{
1514 struct commit *one, *two;
Johannes Schindelin76e2a092024-02-28 09:44:14 +00001515 struct commit_list *mbs = NULL;
brian m. carlson151b2912016-09-05 20:08:07 +00001516 struct object_id oid_tmp;
Junio C Hamano619a6442009-10-18 12:34:56 -07001517 const char *dots;
1518 int st;
1519
1520 dots = strstr(name, "...");
1521 if (!dots)
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001522 return repo_get_oid(r, name, oid);
Junio C Hamano619a6442009-10-18 12:34:56 -07001523 if (dots == name)
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001524 st = repo_get_oid(r, "HEAD", &oid_tmp);
Junio C Hamano619a6442009-10-18 12:34:56 -07001525 else {
1526 struct strbuf sb;
1527 strbuf_init(&sb, dots - name);
1528 strbuf_add(&sb, name, dots - name);
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001529 st = repo_get_oid_committish(r, sb.buf, &oid_tmp);
Junio C Hamano619a6442009-10-18 12:34:56 -07001530 strbuf_release(&sb);
1531 }
1532 if (st)
1533 return st;
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001534 one = lookup_commit_reference_gently(r, &oid_tmp, 0);
Junio C Hamano619a6442009-10-18 12:34:56 -07001535 if (!one)
1536 return -1;
1537
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001538 if (repo_get_oid_committish(r, dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
Junio C Hamano619a6442009-10-18 12:34:56 -07001539 return -1;
Nguyễn Thái Ngọc Duy0daf7ff2019-04-16 16:33:41 +07001540 two = lookup_commit_reference_gently(r, &oid_tmp, 0);
Junio C Hamano619a6442009-10-18 12:34:56 -07001541 if (!two)
1542 return -1;
Johannes Schindelin76e2a092024-02-28 09:44:14 +00001543 if (repo_get_merge_bases(r, one, two, &mbs) < 0) {
1544 free_commit_list(mbs);
1545 return -1;
1546 }
Junio C Hamano619a6442009-10-18 12:34:56 -07001547 if (!mbs || mbs->next)
1548 st = -1;
1549 else {
1550 st = 0;
brian m. carlson151b2912016-09-05 20:08:07 +00001551 oidcpy(oid, &mbs->item->object.oid);
Junio C Hamano619a6442009-10-18 12:34:56 -07001552 }
1553 free_commit_list(mbs);
1554 return st;
1555}
1556
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001557/* parse @something syntax, when 'something' is not {.*} */
1558static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
1559{
1560 const char *next;
1561
1562 if (len || name[1] == '{')
1563 return -1;
1564
1565 /* make sure it's a single @, or @@{.*}, not @foo */
Jeff King8cd42492014-01-15 03:31:57 -05001566 next = memchr(name + len + 1, '@', namelen - len - 1);
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001567 if (next && next[1] != '{')
1568 return -1;
1569 if (!next)
1570 next = name + namelen;
1571 if (next != name + 1)
1572 return -1;
1573
1574 strbuf_reset(buf);
1575 strbuf_add(buf, "HEAD", 4);
1576 return 1;
1577}
1578
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001579static int reinterpret(struct repository *r,
1580 const char *name, int namelen, int len,
Jeff King0e9f62d2017-03-02 03:23:01 -05001581 struct strbuf *buf, unsigned allowed)
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001582{
1583 /* we have extra data, which might need further processing */
1584 struct strbuf tmp = STRBUF_INIT;
1585 int used = buf->len;
1586 int ret;
Jonathan Tana4f66a72020-09-01 15:28:07 -07001587 struct interpret_branch_name_options options = {
1588 .allowed = allowed
1589 };
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001590
1591 strbuf_add(buf, name + len, namelen - len);
Jonathan Tana4f66a72020-09-01 15:28:07 -07001592 ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, &options);
Felipe Contreras7a0a49a2013-05-07 17:04:30 -05001593 /* that data was not interpreted, remove our cruft */
1594 if (ret < 0) {
1595 strbuf_setlen(buf, used);
1596 return len;
1597 }
1598 strbuf_reset(buf);
1599 strbuf_addbuf(buf, &tmp);
1600 strbuf_release(&tmp);
1601 /* tweak for size of {-N} versus expanded ref name */
1602 return ret - used + len;
1603}
1604
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001605static void set_shortened_ref(struct repository *r, struct strbuf *buf, const char *ref)
Jeff Kinga39c14a2014-01-15 03:26:33 -05001606{
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001607 char *s = refs_shorten_unambiguous_ref(get_main_ref_store(r), ref, 0);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001608 strbuf_reset(buf);
1609 strbuf_addstr(buf, s);
1610 free(s);
1611}
1612
Jeff King0e9f62d2017-03-02 03:23:01 -05001613static int branch_interpret_allowed(const char *refname, unsigned allowed)
1614{
1615 if (!allowed)
1616 return 1;
1617
1618 if ((allowed & INTERPRET_BRANCH_LOCAL) &&
1619 starts_with(refname, "refs/heads/"))
1620 return 1;
1621 if ((allowed & INTERPRET_BRANCH_REMOTE) &&
1622 starts_with(refname, "refs/remotes/"))
1623 return 1;
1624
1625 return 0;
1626}
1627
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001628static int interpret_branch_mark(struct repository *r,
1629 const char *name, int namelen,
Jeff King48c58472015-05-21 00:45:43 -04001630 int at, struct strbuf *buf,
1631 int (*get_mark)(const char *, int),
1632 const char *(*get_data)(struct branch *,
Jeff King0e9f62d2017-03-02 03:23:01 -05001633 struct strbuf *),
Jonathan Tana4f66a72020-09-01 15:28:07 -07001634 const struct interpret_branch_name_options *options)
Jeff Kinga39c14a2014-01-15 03:26:33 -05001635{
1636 int len;
Jeff King48c58472015-05-21 00:45:43 -04001637 struct branch *branch;
1638 struct strbuf err = STRBUF_INIT;
1639 const char *value;
Jeff Kinga39c14a2014-01-15 03:26:33 -05001640
Jeff King48c58472015-05-21 00:45:43 -04001641 len = get_mark(name + at, namelen - at);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001642 if (!len)
1643 return -1;
1644
Jeff King3f6eb302014-01-15 03:37:23 -05001645 if (memchr(name, ':', at))
1646 return -1;
1647
Jeff King48c58472015-05-21 00:45:43 -04001648 if (at) {
1649 char *name_str = xmemdupz(name, at);
1650 branch = branch_get(name_str);
1651 free(name_str);
1652 } else
1653 branch = branch_get(NULL);
1654
1655 value = get_data(branch, &err);
Jonathan Tanf24c30e2020-09-01 15:28:09 -07001656 if (!value) {
1657 if (options->nonfatal_dangling_mark) {
1658 strbuf_release(&err);
1659 return -1;
1660 } else {
1661 die("%s", err.buf);
1662 }
1663 }
Jeff King48c58472015-05-21 00:45:43 -04001664
Jonathan Tana4f66a72020-09-01 15:28:07 -07001665 if (!branch_interpret_allowed(value, options->allowed))
Jeff King0e9f62d2017-03-02 03:23:01 -05001666 return -1;
1667
Nguyễn Thái Ngọc Duyea1c8732019-04-16 16:33:27 +07001668 set_shortened_ref(r, buf, value);
Jeff Kinga39c14a2014-01-15 03:26:33 -05001669 return len + at;
1670}
1671
Nguyễn Thái Ngọc Duy8f56e9d2019-04-06 18:34:26 +07001672int repo_interpret_branch_name(struct repository *r,
1673 const char *name, int namelen,
1674 struct strbuf *buf,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001675 const struct interpret_branch_name_options *options)
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001676{
Jeff Kingf278f402014-01-15 03:27:32 -05001677 char *at;
Jeff King9892d5d2014-01-15 03:40:46 -05001678 const char *start;
Jeff King13228c32017-02-27 04:25:40 -05001679 int len;
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001680
Felipe Contrerascf99a762013-09-02 01:34:29 -05001681 if (!namelen)
1682 namelen = strlen(name);
1683
Jonathan Tana4f66a72020-09-01 15:28:07 -07001684 if (!options->allowed || (options->allowed & INTERPRET_BRANCH_LOCAL)) {
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001685 len = interpret_nth_prior_checkout(r, name, namelen, buf);
Jeff King0e9f62d2017-03-02 03:23:01 -05001686 if (!len) {
1687 return len; /* syntax Ok, not enough switches */
1688 } else if (len > 0) {
1689 if (len == namelen)
1690 return len; /* consumed all */
1691 else
Jonathan Tana4f66a72020-09-01 15:28:07 -07001692 return reinterpret(r, name, namelen, len, buf,
1693 options->allowed);
Jeff King0e9f62d2017-03-02 03:23:01 -05001694 }
Jeff Kingd46a8302010-01-28 04:52:22 -05001695 }
1696
Jeff King9892d5d2014-01-15 03:40:46 -05001697 for (start = name;
1698 (at = memchr(start, '@', namelen - (start - name)));
1699 start = at + 1) {
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001700
Jonathan Tana4f66a72020-09-01 15:28:07 -07001701 if (!options->allowed || (options->allowed & INTERPRET_BRANCH_HEAD)) {
Jeff King0e9f62d2017-03-02 03:23:01 -05001702 len = interpret_empty_at(name, namelen, at - name, buf);
1703 if (len > 0)
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001704 return reinterpret(r, name, namelen, len, buf,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001705 options->allowed);
Jeff King0e9f62d2017-03-02 03:23:01 -05001706 }
Felipe Contreras9ba89f42013-09-02 01:34:30 -05001707
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001708 len = interpret_branch_mark(r, name, namelen, at - name, buf,
Jeff King0e9f62d2017-03-02 03:23:01 -05001709 upstream_mark, branch_get_upstream,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001710 options);
Jeff King9892d5d2014-01-15 03:40:46 -05001711 if (len > 0)
1712 return len;
Jeff Kingadfe5d02015-05-21 00:45:47 -04001713
Nguyễn Thái Ngọc Duy71588ed2019-04-16 16:33:28 +07001714 len = interpret_branch_mark(r, name, namelen, at - name, buf,
Jeff King0e9f62d2017-03-02 03:23:01 -05001715 push_mark, branch_get_push,
Jonathan Tana4f66a72020-09-01 15:28:07 -07001716 options);
Zbigniew Jędrzejewski-Szmek64720282012-04-14 09:54:35 +02001717 if (len > 0)
Zbigniew Jędrzejewski-Szmek17c82212012-04-14 09:54:34 +02001718 return len;
Zbigniew Jędrzejewski-Szmekbb0dab52012-04-14 09:54:33 +02001719 }
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001720
Jeff Kinga39c14a2014-01-15 03:26:33 -05001721 return -1;
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001722}
1723
Jeff King0e9f62d2017-03-02 03:23:01 -05001724void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001725{
1726 int len = strlen(name);
Jonathan Tana4f66a72020-09-01 15:28:07 -07001727 struct interpret_branch_name_options options = {
1728 .allowed = allowed
1729 };
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 15:58:46 +02001730 int used = repo_interpret_branch_name(the_repository, name, len, sb,
1731 &options);
Junio C Hamano84cf2462013-05-15 14:32:30 -07001732
Junio C Hamano84cf2462013-05-15 14:32:30 -07001733 if (used < 0)
1734 used = 0;
1735 strbuf_add(sb, name + used, len - used);
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001736}
1737
1738int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
1739{
Junio C Hamano7c3f8472017-10-17 00:08:08 -07001740 if (startup_info->have_repository)
1741 strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
1742 else
1743 strbuf_addstr(sb, name);
Junio C Hamanoa625b092017-11-14 17:12:58 +05301744
1745 /*
1746 * This splice must be done even if we end up rejecting the
1747 * name; builtin/branch.c::copy_or_rename_branch() still wants
1748 * to see what the name expanded to so that "branch -m" can be
1749 * used as a tool to correct earlier mistakes.
1750 */
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001751 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
Junio C Hamanoa625b092017-11-14 17:12:58 +05301752
1753 if (*name == '-' ||
1754 !strcmp(sb->buf, "refs/heads/HEAD"))
1755 return -1;
1756
Michael Haggerty8d9c5012011-09-15 23:10:25 +02001757 return check_refname_format(sb->buf, 0);
Jonathan Nieder6bab74e2010-11-06 06:46:52 -05001758}
1759
Junio C Hamanoae0ba8e2010-01-19 23:17:11 -08001760/*
brian m. carlsone82caf32017-07-13 23:49:28 +00001761 * This is like "get_oid_basic()", except it allows "object ID expressions",
Junio C Hamano9938af62005-08-03 22:15:49 -07001762 * notably "xyz^" for "parent of xyz"
1763 */
Nguyễn Thái Ngọc Duyec580ea2019-04-16 16:33:37 +07001764int repo_get_oid(struct repository *r, const char *name, struct object_id *oid)
brian m. carlson2764fd92016-04-17 23:10:36 +00001765{
brian m. carlsone82caf32017-07-13 23:49:28 +00001766 struct object_context unused;
Nguyễn Thái Ngọc Duyec580ea2019-04-16 16:33:37 +07001767 return get_oid_with_context(r, name, 0, oid, &unused);
brian m. carlson2764fd92016-04-17 23:10:36 +00001768}
1769
Paul-Sebastian Ungureanuf5116f42019-02-25 23:16:05 +00001770/*
1771 * This returns a non-zero value if the string (built using printf
1772 * format and the given arguments) is not a valid object.
1773 */
1774int get_oidf(struct object_id *oid, const char *fmt, ...)
1775{
1776 va_list ap;
1777 int ret;
1778 struct strbuf sb = STRBUF_INIT;
1779
1780 va_start(ap, fmt);
1781 strbuf_vaddf(&sb, fmt, ap);
1782 va_end(ap);
1783
Ævar Arnfjörð Bjarmasond850b7a2023-03-28 15:58:46 +02001784 ret = repo_get_oid(the_repository, sb.buf, oid);
Paul-Sebastian Ungureanuf5116f42019-02-25 23:16:05 +00001785 strbuf_release(&sb);
1786
1787 return ret;
1788}
brian m. carlson2764fd92016-04-17 23:10:36 +00001789
1790/*
Richard Hansena8a54062013-09-04 15:04:31 -04001791 * Many callers know that the user meant to name a commit-ish by
Junio C Hamanocd74e472012-07-02 12:04:52 -07001792 * syntactical positions where the object name appears. Calling this
1793 * function allows the machinery to disambiguate shorter-than-unique
Richard Hansena8a54062013-09-04 15:04:31 -04001794 * abbreviated object names between commit-ish and others.
Junio C Hamanocd74e472012-07-02 12:04:52 -07001795 *
1796 * Note that this does NOT error out when the named object is not a
Richard Hansena8a54062013-09-04 15:04:31 -04001797 * commit-ish. It is merely to give a hint to the disambiguation
Junio C Hamanocd74e472012-07-02 12:04:52 -07001798 * machinery.
1799 */
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001800int repo_get_oid_committish(struct repository *r,
1801 const char *name,
1802 struct object_id *oid)
Junio C Hamanocd74e472012-07-02 12:04:52 -07001803{
1804 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001805 return get_oid_with_context(r, name, GET_OID_COMMITTISH,
brian m. carlsone82caf32017-07-13 23:49:28 +00001806 oid, &unused);
Junio C Hamanocd74e472012-07-02 12:04:52 -07001807}
1808
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001809int repo_get_oid_treeish(struct repository *r,
1810 const char *name,
1811 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001812{
1813 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001814 return get_oid_with_context(r, name, GET_OID_TREEISH,
brian m. carlsone82caf32017-07-13 23:49:28 +00001815 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001816}
1817
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001818int repo_get_oid_commit(struct repository *r,
1819 const char *name,
1820 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001821{
1822 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001823 return get_oid_with_context(r, name, GET_OID_COMMIT,
brian m. carlsone82caf32017-07-13 23:49:28 +00001824 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001825}
1826
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001827int repo_get_oid_tree(struct repository *r,
1828 const char *name,
1829 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001830{
1831 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001832 return get_oid_with_context(r, name, GET_OID_TREE,
brian m. carlsone82caf32017-07-13 23:49:28 +00001833 oid, &unused);
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001834}
1835
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001836int repo_get_oid_blob(struct repository *r,
1837 const char *name,
1838 struct object_id *oid)
Junio C Hamanodaba53a2012-07-02 23:35:05 -07001839{
1840 struct object_context unused;
Nguyễn Thái Ngọc Duy65e50462019-04-16 16:33:40 +07001841 return get_oid_with_context(r, name, GET_OID_BLOB,
brian m. carlsone82caf32017-07-13 23:49:28 +00001842 oid, &unused);
Martin Koeglera0cd87a2007-04-23 22:55:05 +02001843}
1844
Matthieu Moy009fee42009-12-07 11:10:50 +01001845/* Must be called only when object_name:filename doesn't exist. */
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001846static void diagnose_invalid_oid_path(struct repository *r,
1847 const char *prefix,
brian m. carlsone82caf32017-07-13 23:49:28 +00001848 const char *filename,
1849 const struct object_id *tree_oid,
1850 const char *object_name,
1851 int object_name_len)
Matthieu Moy009fee42009-12-07 11:10:50 +01001852{
brian m. carlsone82caf32017-07-13 23:49:28 +00001853 struct object_id oid;
Elijah Newren5ec1e722019-04-05 08:00:12 -07001854 unsigned short mode;
Matthieu Moy009fee42009-12-07 11:10:50 +01001855
1856 if (!prefix)
1857 prefix = "";
1858
René Scharfedbe44fa2015-05-19 23:44:23 +02001859 if (file_exists(filename))
Jeff Kingb0418302020-01-24 19:13:01 -05001860 die(_("path '%s' exists on disk, but not in '%.*s'"),
René Scharfeb2981d02013-03-16 19:29:31 +01001861 filename, object_name_len, object_name);
Junio C Hamanoc7054202017-05-30 09:23:33 +09001862 if (is_missing_file_error(errno)) {
Jeff Kingb2724c82014-06-19 17:26:56 -04001863 char *fullname = xstrfmt("%s%s", prefix, filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01001864
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07001865 if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
Jeff Kingb0418302020-01-24 19:13:01 -05001866 die(_("path '%s' exists, but not '%s'\n"
1867 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
Matthieu Moy009fee42009-12-07 11:10:50 +01001868 fullname,
1869 filename,
René Scharfeb2981d02013-03-16 19:29:31 +01001870 object_name_len, object_name,
Michael J Grubere41d7182011-03-31 11:17:34 +02001871 fullname,
René Scharfeb2981d02013-03-16 19:29:31 +01001872 object_name_len, object_name,
Michael J Grubere41d7182011-03-31 11:17:34 +02001873 filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01001874 }
Jeff Kingb0418302020-01-24 19:13:01 -05001875 die(_("path '%s' does not exist in '%.*s'"),
René Scharfeb2981d02013-03-16 19:29:31 +01001876 filename, object_name_len, object_name);
Matthieu Moy009fee42009-12-07 11:10:50 +01001877 }
1878}
1879
1880/* Must be called only when :stage:filename doesn't exist. */
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001881static void diagnose_invalid_index_path(struct repository *r,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001882 int stage,
Matthieu Moy009fee42009-12-07 11:10:50 +01001883 const char *prefix,
1884 const char *filename)
1885{
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001886 struct index_state *istate = r->index;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07001887 const struct cache_entry *ce;
Matthieu Moy009fee42009-12-07 11:10:50 +01001888 int pos;
1889 unsigned namelen = strlen(filename);
Jeff King43bb66a2015-09-24 17:07:52 -04001890 struct strbuf fullname = STRBUF_INIT;
Matthieu Moy009fee42009-12-07 11:10:50 +01001891
1892 if (!prefix)
1893 prefix = "";
1894
1895 /* Wrong stage number? */
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001896 pos = index_name_pos(istate, filename, namelen);
Matthieu Moy009fee42009-12-07 11:10:50 +01001897 if (pos < 0)
1898 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001899 if (pos < istate->cache_nr) {
1900 ce = istate->cache[pos];
Derrick Stolee4925adb2022-04-26 20:43:19 +00001901 if (!S_ISSPARSEDIR(ce->ce_mode) &&
1902 ce_namelen(ce) == namelen &&
Markus Heidelberg77e84662010-02-28 16:49:15 +01001903 !memcmp(ce->name, filename, namelen))
Jeff Kingb0418302020-01-24 19:13:01 -05001904 die(_("path '%s' is in the index, but not at stage %d\n"
1905 "hint: Did you mean ':%d:%s'?"),
Markus Heidelberg77e84662010-02-28 16:49:15 +01001906 filename, stage,
1907 ce_stage(ce), filename);
1908 }
Matthieu Moy009fee42009-12-07 11:10:50 +01001909
1910 /* Confusion between relative and absolute filenames? */
Jeff King43bb66a2015-09-24 17:07:52 -04001911 strbuf_addstr(&fullname, prefix);
1912 strbuf_addstr(&fullname, filename);
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001913 pos = index_name_pos(istate, fullname.buf, fullname.len);
Matthieu Moy009fee42009-12-07 11:10:50 +01001914 if (pos < 0)
1915 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001916 if (pos < istate->cache_nr) {
1917 ce = istate->cache[pos];
Derrick Stolee4925adb2022-04-26 20:43:19 +00001918 if (!S_ISSPARSEDIR(ce->ce_mode) &&
1919 ce_namelen(ce) == fullname.len &&
Jeff King43bb66a2015-09-24 17:07:52 -04001920 !memcmp(ce->name, fullname.buf, fullname.len))
Jeff Kingb0418302020-01-24 19:13:01 -05001921 die(_("path '%s' is in the index, but not '%s'\n"
1922 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
Jeff King43bb66a2015-09-24 17:07:52 -04001923 fullname.buf, filename,
1924 ce_stage(ce), fullname.buf,
Michael J Grubere41d7182011-03-31 11:17:34 +02001925 ce_stage(ce), filename);
Markus Heidelberg77e84662010-02-28 16:49:15 +01001926 }
Matthieu Moy009fee42009-12-07 11:10:50 +01001927
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07001928 if (repo_file_exists(r, filename))
Jeff Kingb0418302020-01-24 19:13:01 -05001929 die(_("path '%s' exists on disk, but not in the index"), filename);
Junio C Hamanoc7054202017-05-30 09:23:33 +09001930 if (is_missing_file_error(errno))
Jeff Kingb0418302020-01-24 19:13:01 -05001931 die(_("path '%s' does not exist (neither on disk nor in the index)"),
Matthieu Moy009fee42009-12-07 11:10:50 +01001932 filename);
1933
Jeff King43bb66a2015-09-24 17:07:52 -04001934 strbuf_release(&fullname);
Matthieu Moy009fee42009-12-07 11:10:50 +01001935}
1936
1937
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001938static char *resolve_relative_path(struct repository *r, const char *rel)
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001939{
Christian Couder59556542013-11-30 21:55:40 +01001940 if (!starts_with(rel, "./") && !starts_with(rel, "../"))
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001941 return NULL;
1942
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07001943 if (r != the_repository || !is_inside_work_tree())
Jeff Kingb0418302020-01-24 19:13:01 -05001944 die(_("relative path syntax can't be used outside working tree"));
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001945
1946 /* die() inside prefix_path() if resolved path is outside worktree */
1947 return prefix_path(startup_info->prefix,
1948 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1949 rel);
1950}
1951
Derrick Stolee561287d2022-04-26 20:43:18 +00001952static int reject_tree_in_index(struct repository *repo,
1953 int only_to_die,
1954 const struct cache_entry *ce,
1955 int stage,
1956 const char *prefix,
1957 const char *cp)
1958{
1959 if (!S_ISSPARSEDIR(ce->ce_mode))
1960 return 0;
1961 if (only_to_die)
1962 diagnose_invalid_index_path(repo, stage, prefix, cp);
1963 return -1;
1964}
1965
Junio C Hamano7589e632019-02-06 22:05:22 -08001966static enum get_oid_result get_oid_with_context_1(struct repository *repo,
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07001967 const char *name,
brian m. carlsone82caf32017-07-13 23:49:28 +00001968 unsigned flags,
1969 const char *prefix,
1970 struct object_id *oid,
1971 struct object_context *oc)
Clément Poulain573285e2010-06-09 19:02:06 +02001972{
Martin Koeglera0cd87a2007-04-23 22:55:05 +02001973 int ret, bracket_depth;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001974 int namelen = strlen(name);
1975 const char *cp;
brian m. carlson321c89b2017-07-13 23:49:29 +00001976 int only_to_die = flags & GET_OID_ONLY_TO_DIE;
Linus Torvalds51196022006-04-18 16:45:16 -07001977
Clément Poulain573285e2010-06-09 19:02:06 +02001978 memset(oc, 0, sizeof(*oc));
1979 oc->mode = S_IFINVALID;
Jeff Kingd72cae12017-05-19 08:52:25 -04001980 strbuf_init(&oc->symlink_path, 0);
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07001981 ret = get_oid_1(repo, name, namelen, oid, flags);
Ævar Arnfjörð Bjarmason245b9482021-12-28 14:28:50 +01001982 if (!ret && flags & GET_OID_REQUIRE_PATH)
1983 die(_("<object>:<path> required, only <object> '%s' given"),
1984 name);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001985 if (!ret)
1986 return ret;
Junio C Hamano33bd5982012-07-02 10:32:11 -07001987 /*
Martin Ågren1e6771e2020-12-31 12:56:20 +01001988 * tree:path --> object name of path in tree
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001989 * :path -> object name of absolute path in index
1990 * :./path -> object name of path relative to cwd in index
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001991 * :[0-3]:path -> object name of path in index at stage
Matthieu Moy95ad6d22010-09-24 18:43:59 +02001992 * :/foo -> recent commit matching foo
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001993 */
1994 if (name[0] == ':') {
1995 int stage = 0;
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +07001996 const struct cache_entry *ce;
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07001997 char *new_path = NULL;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07001998 int pos;
Junio C Hamano2e83b662011-05-10 12:02:54 -07001999 if (!only_to_die && namelen > 2 && name[1] == '/') {
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07002000 struct handle_one_ref_cb cb;
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07002001 struct commit_list *list = NULL;
Michael Haggerty2b2a5be2015-05-25 18:38:28 +00002002
Nguyễn Thái Ngọc Duyc931ba42019-04-16 16:33:33 +07002003 cb.repo = repo;
2004 cb.list = &list;
Junio C Hamano5ff4b922020-04-09 17:03:45 -07002005 refs_for_each_ref(get_main_ref_store(repo), handle_one_ref, &cb);
Jeff King02204612020-04-09 23:04:11 -04002006 refs_head_ref(get_main_ref_store(repo), handle_one_ref, &cb);
René Scharfee8d1dfe2014-08-21 20:30:29 +02002007 commit_list_sort_by_date(&list);
Nguyễn Thái Ngọc Duy0bb41a12019-04-16 16:33:29 +07002008 return get_oid_oneline(repo, name + 2, oid, list);
Nguyễn Thái Ngọc Duy84baa312010-12-13 10:01:14 +07002009 }
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07002010 if (namelen < 3 ||
2011 name[2] != ':' ||
2012 name[1] < '0' || '3' < name[1])
2013 cp = name + 1;
2014 else {
2015 stage = name[1] - '0';
2016 cp = name + 3;
Linus Torvalds51196022006-04-18 16:45:16 -07002017 }
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07002018 new_path = resolve_relative_path(repo, cp);
Junio C Hamano3d6e0f72010-12-09 13:38:05 -08002019 if (!new_path) {
2020 namelen = namelen - (cp - name);
2021 } else {
2022 cp = new_path;
2023 namelen = strlen(cp);
2024 }
Clément Poulain573285e2010-06-09 19:02:06 +02002025
brian m. carlson321c89b2017-07-13 23:49:29 +00002026 if (flags & GET_OID_RECORD_PATH)
Jeff Kingdc944b62017-05-19 08:54:43 -04002027 oc->path = xstrdup(cp);
Clément Poulain573285e2010-06-09 19:02:06 +02002028
Jeff King581d2fd2019-05-14 09:54:55 -04002029 if (!repo->index || !repo->index->cache)
Nguyễn Thái Ngọc Duyefe461b2019-04-16 16:33:36 +07002030 repo_read_index(repo);
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07002031 pos = index_name_pos(repo->index, cp, namelen);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07002032 if (pos < 0)
2033 pos = -pos - 1;
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07002034 while (pos < repo->index->cache_nr) {
2035 ce = repo->index->cache[pos];
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07002036 if (ce_namelen(ce) != namelen ||
2037 memcmp(ce->name, cp, namelen))
2038 break;
2039 if (ce_stage(ce) == stage) {
Derrick Stolee561287d2022-04-26 20:43:18 +00002040 free(new_path);
2041 if (reject_tree_in_index(repo, only_to_die, ce,
2042 stage, prefix, cp))
2043 return -1;
brian m. carlsone82caf32017-07-13 23:49:28 +00002044 oidcpy(oid, &ce->oid);
Kirill Smelkov90064712010-09-29 15:35:24 +04002045 oc->mode = ce->ce_mode;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07002046 return 0;
2047 }
Junio C Hamanoe7cef452006-05-08 15:44:06 -07002048 pos++;
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07002049 }
Junio C Hamano2e83b662011-05-10 12:02:54 -07002050 if (only_to_die && name[1] && name[1] != '/')
Nguyễn Thái Ngọc Duy04884812019-04-16 16:33:34 +07002051 diagnose_invalid_index_path(repo, stage, prefix, cp);
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07002052 free(new_path);
Junio C Hamano73b0e5a2006-04-21 17:31:04 -07002053 return -1;
2054 }
Shawn Pearcecce91a22006-05-19 03:29:43 -04002055 for (cp = name, bracket_depth = 0; *cp; cp++) {
2056 if (*cp == '{')
2057 bracket_depth++;
2058 else if (bracket_depth && *cp == '}')
2059 bracket_depth--;
2060 else if (!bracket_depth && *cp == ':')
2061 break;
2062 }
2063 if (*cp == ':') {
brian m. carlsone82caf32017-07-13 23:49:28 +00002064 struct object_id tree_oid;
René Scharfeb2981d02013-03-16 19:29:31 +01002065 int len = cp - name;
Jeff King8a10fea2016-09-26 07:59:41 -04002066 unsigned sub_flags = flags;
2067
brian m. carlson321c89b2017-07-13 23:49:29 +00002068 sub_flags &= ~GET_OID_DISAMBIGUATORS;
2069 sub_flags |= GET_OID_TREEISH;
Jeff King8a10fea2016-09-26 07:59:41 -04002070
Nguyễn Thái Ngọc Duy2b1790f2019-04-16 16:33:32 +07002071 if (!get_oid_1(repo, name, len, &tree_oid, sub_flags)) {
Matthieu Moy009fee42009-12-07 11:10:50 +01002072 const char *filename = cp+1;
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07002073 char *new_filename = NULL;
2074
Nguyễn Thái Ngọc Duy0381f7f2019-04-16 16:33:35 +07002075 new_filename = resolve_relative_path(repo, filename);
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07002076 if (new_filename)
2077 filename = new_filename;
brian m. carlson321c89b2017-07-13 23:49:29 +00002078 if (flags & GET_OID_FOLLOW_SYMLINKS) {
Nguyễn Thái Ngọc Duy0dd1f0c2019-06-27 16:28:50 +07002079 ret = get_tree_entry_follow_symlinks(repo, &tree_oid,
brian m. carlson3b683bc2018-05-02 00:25:40 +00002080 filename, oid, &oc->symlink_path,
David Turnerc4ec9672015-05-20 13:03:39 -04002081 &oc->mode);
2082 } else {
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07002083 ret = get_tree_entry(repo, &tree_oid, filename, oid,
brian m. carlson916bc352018-03-12 02:27:51 +00002084 &oc->mode);
David Turnerc4ec9672015-05-20 13:03:39 -04002085 if (ret && only_to_die) {
Nguyễn Thái Ngọc Duy50ddb082019-06-27 16:28:49 +07002086 diagnose_invalid_oid_path(repo, prefix,
David Turnerc4ec9672015-05-20 13:03:39 -04002087 filename,
brian m. carlsone82caf32017-07-13 23:49:28 +00002088 &tree_oid,
David Turnerc4ec9672015-05-20 13:03:39 -04002089 name, len);
2090 }
Matthieu Moy009fee42009-12-07 11:10:50 +01002091 }
brian m. carlson321c89b2017-07-13 23:49:29 +00002092 if (flags & GET_OID_RECORD_PATH)
Jeff Kingdc944b62017-05-19 08:54:43 -04002093 oc->path = xstrdup(filename);
Clément Poulain573285e2010-06-09 19:02:06 +02002094
Nguyễn Thái Ngọc Duy979f79292010-11-28 10:37:32 +07002095 free(new_filename);
Matthieu Moy009fee42009-12-07 11:10:50 +01002096 return ret;
2097 } else {
Junio C Hamano2e83b662011-05-10 12:02:54 -07002098 if (only_to_die)
Jeff Kingb0418302020-01-24 19:13:01 -05002099 die(_("invalid object name '%.*s'."), len, name);
Matthieu Moy009fee42009-12-07 11:10:50 +01002100 }
Linus Torvalds51196022006-04-18 16:45:16 -07002101 }
2102 return ret;
Junio C Hamano9938af62005-08-03 22:15:49 -07002103}
Junio C Hamanof01cc142012-07-02 10:19:35 -07002104
Junio C Hamano8c135ea2012-07-02 11:01:25 -07002105/*
2106 * Call this function when you know "name" given by the end user must
2107 * name an object but it doesn't; the function _may_ die with a better
2108 * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
2109 * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
2110 * you have a chance to diagnose the error further.
2111 */
Nguyễn Thái Ngọc Duye270f422019-04-16 16:33:39 +07002112void maybe_die_on_misspelt_object_name(struct repository *r,
2113 const char *name,
2114 const char *prefix)
Junio C Hamanof01cc142012-07-02 10:19:35 -07002115{
2116 struct object_context oc;
brian m. carlsone82caf32017-07-13 23:49:28 +00002117 struct object_id oid;
Ævar Arnfjörð Bjarmason9ce60002021-12-28 14:28:49 +01002118 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 +07002119 prefix, &oid, &oc);
Junio C Hamano8c135ea2012-07-02 11:01:25 -07002120}
2121
Duy Nguyen127b48f2019-02-12 19:43:23 +07002122enum get_oid_result get_oid_with_context(struct repository *repo,
2123 const char *str,
2124 unsigned flags,
2125 struct object_id *oid,
2126 struct object_context *oc)
Junio C Hamanof01cc142012-07-02 10:19:35 -07002127{
brian m. carlson321c89b2017-07-13 23:49:29 +00002128 if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
Martin Ågren1e6771e2020-12-31 12:56:20 +01002129 BUG("incompatible flags for get_oid_with_context");
Nguyễn Thái Ngọc Duy3a7a6982019-01-12 09:13:28 +07002130 return get_oid_with_context_1(repo, str, flags, NULL, oid, oc);
Junio C Hamanof01cc142012-07-02 10:19:35 -07002131}