git-repack --max-pack-size: alter sha1close() 3rd argument

PATCH New Dana How 1 participant 1 message Jun 15, 2016

Share & tools

Dana How

author

2016-06-15 22:43 UTC #0 lore raw

PATCH 1/5 git-repack --max-pack-size: alter sha1close() 3rd argument

update=0 suppressed writing the final SHA-1 but was not used. Now final=0 suppresses SHA-1 finalization, SHA-1 writing, and closing -- in other words, only flush the buffer.

Signed-off-by Dana L. How <[email protected]>

---
 csum-file.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

csum-file.c +5 -3

index 7c806ad..9913cb5 100644
@@ -29,18 +29,20 @@ static void sha1flush(struct sha1file *f, unsigned int count)
 	}
 }
 
-int sha1close(struct sha1file *f, unsigned char *result, int update)
+int sha1close(struct sha1file *f, unsigned char *result, int final)
 {
 	unsigned offset = f->offset;
 	if (offset) {
 		SHA1_Update(&f->ctx, f->buffer, offset);
 		sha1flush(f, offset);
+		f->offset = 0;
 	}
+	if (!final)
+		return 0;	/* only want to flush (no checksum write, no close) */
 	SHA1_Final(f->buffer, &f->ctx);
 	if (result)
 		hashcpy(result, f->buffer);
-	if (update)
-		sha1flush(f, 20);
+	sha1flush(f, 20);
 	if (close(f->fd))
 		die("%s: sha1 file error on close (%s)", f->name, strerror(errno));
 	free(f);

Signature · 1 line

1.5.2.rc0.789.gd951