PR 128399: Don't compute the SHA when updating the index if GVFS_SKIP_SHA_ON_INDEX is set.

Don't compute the SHA when updating the index if GVFS_SKIP_SHA_ON_INDEX is set.

Author: benpeart

gvfs.h

@@ -13,7 +13,7 @@
 /*
  * The list of bits in the core_gvfs setting
  */
-#define GVFS_SKIP_SHA_ON_INDEX_READ 1
+#define GVFS_SKIP_SHA_ON_INDEX 1
 #define GVFS_SPARSE_HASHMAP 2
 #define GVFS_MISSING_OK 4
 #define GVFS_NO_DELETE_OUTSIDE_SPARSECHECKOUT 8

read-cache.c

@@ -1366,7 +1366,7 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size)
 	and is called before git_config(git_default_config, ...)
 	the config values are not loaded and has to be retrieved directly here.
 	*/
-	if (gvfs_config_load_and_is_set(GVFS_SKIP_SHA_ON_INDEX_READ))
+	if (gvfs_config_load_and_is_set(GVFS_SKIP_SHA_ON_INDEX))
 		return 0;
 
 	git_SHA1_Init(&c);
@@ -1735,7 +1735,8 @@ static int ce_write_flush(git_SHA_CTX *context, int fd)
 {
 	unsigned int buffered = write_buffer_len;
 	if (buffered) {
-		git_SHA1_Update(context, write_buffer, buffered);
+		if (!gvfs_config_is_set(GVFS_SKIP_SHA_ON_INDEX))
+			git_SHA1_Update(context, write_buffer, buffered);
 		if (write_in_full(fd, write_buffer, buffered) != buffered)
 			return -1;
 		write_buffer_len = 0;
@@ -1780,7 +1781,8 @@ static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
 
 	if (left) {
 		write_buffer_len = 0;
-		git_SHA1_Update(context, write_buffer, left);
+		if (!gvfs_config_is_set(GVFS_SKIP_SHA_ON_INDEX))
+			git_SHA1_Update(context, write_buffer, left);
 	}
 
 	/* Flush first if not enough space for SHA1 signature */
@@ -1791,7 +1793,10 @@ static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
 	}
 
 	/* Append the SHA1 signature at the end */
-	git_SHA1_Final(write_buffer + left, context);
+	if (!gvfs_config_is_set(GVFS_SKIP_SHA_ON_INDEX))
+		git_SHA1_Final(write_buffer + left, context);
+	else
+		hashclr(write_buffer + left);
 	hashcpy(sha1, write_buffer + left);
 	left += 20;
 	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;