Merge branch 'bc/object-id' into next

diff --git a/fetch-pack.c b/fetch-pack.c
index 2ea358861dacb91697137dc22891122e35b6a472..52932b37f8dce61296c37d6fa821d564f0f4a38b 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -925,8 +925,17 @@ static int get_pack(struct fetch_pack_args *args,
            ? fetch_fsck_objects
            : transfer_fsck_objects >= 0
            ? transfer_fsck_objects
-           : 0)
-               argv_array_push(&cmd.args, "--strict");
+           : 0) {
+               if (args->from_promisor)
+                       /*
+                        * We cannot use --strict in index-pack because it
+                        * checks both broken objects and links, but we only
+                        * want to check for broken objects.
+                        */
+                       argv_array_push(&cmd.args, "--fsck-objects");
+               else
+                       argv_array_push(&cmd.args, "--strict");
+       }
 
        cmd.in = demux.out;
        cmd.git_cmd = 1;