@matheusbsbs / matheus-bagliano / commits / 7367d88261

archive: stop passing "stage" through read_tree_recursive()

The "stage" variable being passed around in the archive code has only ever been an elaborate way to hardcode the value "0". This code was added in its original form in e4fbbfe9ecc (Add git-zip-tree, 2006-08-26), at which point a hardcoded "0" would be passed down through read_tree_recursive() to write_zip_entry(). It was then diligently added to the "struct directory" in ed22b4173bd (archive: support filtering paths with glob, 2014-09-21), but we were still not doing anything except passing it around as-is. Let's stop doing that in the code internal to archive.c, we'll still feed "0" to read_tree_recursive() itself, but won't use it. That we're providing it at all to read_tree_recursive() will be changed in a follow-up commit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Mar 20, 2021 at 23:37 UTC 7367d88261e5df7b1458cc02217f0e302bc2e127

1 file changed +7 -9

archive.c

+7 -9

@@ -107,7 +107,6 @@ struct directory {

107 struct object_id oid;

108 int baselen, len;

109 unsigned mode;

110 - int stage;

110 char path[FLEX_ARRAY];

111 };

112

@@ -138,7 +137,7 @@ static int check_attr_export_subst(const struct attr_check *check)

137 }

138

139 static int write_archive_entry(const struct object_id *oid, const char *base,

141 - int baselen, const char *filename, unsigned mode, int stage,

140 + int baselen, const char *filename, unsigned mode,

141 void *context)

142 {

143 static struct strbuf path = STRBUF_INIT;

@@ -197,7 +196,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,

196

197 static void queue_directory(const unsigned char *sha1,

198 struct strbuf *base, const char *filename,

200 - unsigned mode, int stage, struct archiver_context *c)

199 + unsigned mode, struct archiver_context *c)

200 {

201 struct directory *d;

202 size_t len = st_add4(base->len, 1, strlen(filename), 1);

@@ -205,7 +204,6 @@ static void queue_directory(const unsigned char *sha1,

204 d->up = c->bottom;

205 d->baselen = base->len;

206 d->mode = mode;

208 - d->stage = stage;

207 c->bottom = d;

208 d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename);

209 hashcpy(d->oid.hash, sha1);

@@ -224,7 +222,7 @@ static int write_directory(struct archiver_context *c)

222 write_directory(c) ||

223 write_archive_entry(&d->oid, d->path, d->baselen,

224 d->path + d->baselen, d->mode,

227 - d->stage, c) != READ_TREE_RECURSIVE;

225 + c) != READ_TREE_RECURSIVE;

226 free(d);

227 return ret ? -1 : 0;

228 }

@@ -256,14 +254,14 @@ static int queue_or_write_archive_entry(const struct object_id *oid,

254 if (check_attr_export_ignore(check))

255 return 0;

256 queue_directory(oid->hash, base, filename,

259 - mode, stage, c);

257 + mode, c);

258 return READ_TREE_RECURSIVE;

259 }

260

261 if (write_directory(c))

262 return -1;

263 return write_archive_entry(oid, base->buf, base->len, filename, mode,

266 - stage, context);

264 + context);

265 }

266

267 struct extra_file_info {

@@ -377,8 +375,8 @@ struct path_exists_context {

375 };

376

377 static int reject_entry(const struct object_id *oid, struct strbuf *base,

380 - const char *filename, unsigned mode,

381 - int stage, void *context)

378 + const char *filename, unsigned mode, int stage,

379 + void *context)

380 {

381 int ret = -1;

382 struct path_exists_context *ctx = context;