archive: convert queue_directory to struct object_id

rscharfe · gitster · commit e124ecf7f764 · 2021-08-27T14:19:00.000-07:00
Pass the struct object_id on instead of just its hash member.
This is simpler and avoids the need to guess the algorithm.

Signed-off-by: René Scharfe &lt;l.s.r@web.de&gt;
Acked-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/archive.c b/archive.c
@@ -191,7 +191,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
 	return err;
 }
 
-static void queue_directory(const unsigned char *sha1,
+static void queue_directory(const struct object_id *oid,
 		struct strbuf *base, const char *filename,
 		unsigned mode, struct archiver_context *c)
 {
@@ -203,7 +203,7 @@ static void queue_directory(const unsigned char *sha1,
 	d->mode	   = mode;
 	c->bottom  = d;
 	d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename);
-	oidread(&d->oid, sha1);
+	oidcpy(&d->oid, oid);
 }
 
 static int write_directory(struct archiver_context *c)
@@ -250,8 +250,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
 
 		if (check_attr_export_ignore(check))
 			return 0;
-		queue_directory(oid->hash, base, filename,
-				mode, c);
+		queue_directory(oid, base, filename, mode, c);
 		return READ_TREE_RECURSIVE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ static int write_archive_entry(const struct object_id oid, const char base,`
`191`	`191`	`return err;`
`192`	`192`	`}`
`193`	`193`
`194`		`-static void queue_directory(const unsigned char *sha1,`
	`194`	`+static void queue_directory(const struct object_id *oid,`
`195`	`195`	`struct strbuf base, const char filename,`
`196`	`196`	`unsigned mode, struct archiver_context *c)`
`197`	`197`	`{`
`@@ -203,7 +203,7 @@ static void queue_directory(const unsigned char *sha1,`
`203`	`203`	`d->mode = mode;`
`204`	`204`	`c->bottom = d;`
`205`	`205`	`d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename);`
`206`		`- oidread(&d->oid, sha1);`
	`206`	`+ oidcpy(&d->oid, oid);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`static int write_directory(struct archiver_context *c)`
`@@ -250,8 +250,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid,`
`250`	`250`
`251`	`251`	`if (check_attr_export_ignore(check))`
`252`	`252`	`return 0;`
`253`		`- queue_directory(oid->hash, base, filename,`
`254`		`- mode, c);`
	`253`	`+ queue_directory(oid, base, filename, mode, c);`
`255`	`254`	`return READ_TREE_RECURSIVE;`
`256`	`255`	`}`
`257`	`256`