fixup! gvfs: add the feature that blobs may be missing

As of 9e59b38 (object-file: emit corruption errors when detected,
2022-12-14), Git will loudly complain about corrupt objects.

That is fine, as long as the idea isn't to re-download locally-corrupted
objects. But that's exactly what we want to do in VFS for Git.

While at it, avoid the XOR operator to flip the bits, when we actually
want to make sure that they are turned off: Use the AND-NOT operator for
that purpose.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

commit.c

@@ -566,9 +566,14 @@ int repo_parse_commit_internal(struct repository *r,
 	int flags = OBJECT_INFO_LOOKUP_REPLACE | OBJECT_INFO_SKIP_FETCH_OBJECT |
 		    OBJECT_INFO_DIE_IF_CORRUPT;
 
-	/* But the GVFS Protocol _does_ support missing commits! */
+	/*
+	 * But the GVFS Protocol _does_ support missing commits!
+	 * And the idea with VFS for Git is to re-download corrupted objects,
+	 * not to fail!
+	 */
 	if (gvfs_config_is_set(GVFS_MISSING_OK))
-		flags ^= OBJECT_INFO_SKIP_FETCH_OBJECT;
+		flags &= ~(OBJECT_INFO_SKIP_FETCH_OBJECT |
+			   OBJECT_INFO_DIE_IF_CORRUPT);
 
 	if (!item)
 		return -1;

object-store.c

@@ -7,6 +7,7 @@
 #include "dir.h"
 #include "environment.h"
 #include "gettext.h"
+#include "gvfs.h"
 #include "gvfs-helper-client.h"
 #include "hex.h"
 #include "hook.h"
@@ -1104,6 +1105,9 @@ void *repo_read_object_file(struct repository *r,
 	unsigned flags = OBJECT_INFO_DIE_IF_CORRUPT | OBJECT_INFO_LOOKUP_REPLACE;
 	void *data;
 
+	if (gvfs_config_is_set(GVFS_MISSING_OK))
+		flags &= ~OBJECT_INFO_DIE_IF_CORRUPT;
+
 	oi.typep = type;
 	oi.sizep = size;
 	oi.contentp = &data;