receive-pack: use strict mode for unpacking objects

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6d8cca46ab934826a84647cbd6e441fee286f330..72d3a345ecbc43c0002011fd59ec6e3bb197dadd 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -860,6 +860,12 @@ imap::
        The configuration variables in the 'imap' section are described
        in linkgit:git-imap-send[1].
 
        The configuration variables in the 'imap' section are described
        in linkgit:git-imap-send[1].
 

+receive.fsckObjects::
+       If it is set to true, git-receive-pack will check all received
+       objects. It will abort in the case of a malformed object or a
+       broken link. The result of an abort are only dangling objects.
+       The default value is true.
+

 receive.unpackLimit::
        If the number of objects received in a push is below this
        limit then the objects will be unpacked into loose object
 receive.unpackLimit::
        If the number of objects received in a push is below this
        limit then the objects will be unpacked into loose object

diff --git a/receive-pack.c b/receive-pack.c
index 326749583221d0f5e81f58608a23ab1dc1601177..f5440ff4d439521edc39bc7a481911ebd7ce0d0c 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -10,6 +10,7 @@
 static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 
 static int deny_non_fast_forwards = 0;
 static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 
 static int deny_non_fast_forwards = 0;

+static int receive_fsck_objects = 1;

 static int receive_unpack_limit = -1;
 static int transfer_unpack_limit = -1;
 static int unpack_limit = 100;
 static int receive_unpack_limit = -1;
 static int transfer_unpack_limit = -1;
 static int unpack_limit = 100;


@@ -35,6 +36,11 @@ static int receive_pack_config(const char *var, const char *value)
                return 0;
        }
 
                return 0;
        }
 

+       if (strcmp(var, "receive.fsckobjects") == 0) {
+               receive_fsck_objects = git_config_bool(var, value);
+               return 0;
+       }
+

        return git_default_config(var, value);
 }
 
        return git_default_config(var, value);
 }
 


@@ -367,11 +373,13 @@ static const char *unpack(void)
                        ntohl(hdr.hdr_version), ntohl(hdr.hdr_entries));
 
        if (ntohl(hdr.hdr_entries) < unpack_limit) {
                        ntohl(hdr.hdr_version), ntohl(hdr.hdr_entries));
 
        if (ntohl(hdr.hdr_entries) < unpack_limit) {

-               int code;
-               const char *unpacker[3];
-               unpacker[0] = "unpack-objects";
-               unpacker[1] = hdr_arg;
-               unpacker[2] = NULL;
+               int code, i = 0;
+               const char *unpacker[4];
+               unpacker[i++] = "unpack-objects";
+               if (receive_fsck_objects)
+                       unpacker[i++] = "--strict";
+               unpacker[i++] = hdr_arg;
+               unpacker[i++] = NULL;

                code = run_command_v_opt(unpacker, RUN_GIT_CMD);
                switch (code) {
                case 0:
                code = run_command_v_opt(unpacker, RUN_GIT_CMD);
                switch (code) {
                case 0:


@@ -392,8 +400,8 @@ static const char *unpack(void)
                        return "unpacker exited with error code";
                }
        } else {
                        return "unpacker exited with error code";
                }
        } else {

-               const char *keeper[6];
-               int s, status;
+               const char *keeper[7];
+               int s, status, i = 0;

                char keep_arg[256];
                struct child_process ip;
 
                char keep_arg[256];
                struct child_process ip;
 


@@ -401,12 +409,14 @@ static const char *unpack(void)
                if (gethostname(keep_arg + s, sizeof(keep_arg) - s))
                        strcpy(keep_arg + s, "localhost");
 
                if (gethostname(keep_arg + s, sizeof(keep_arg) - s))
                        strcpy(keep_arg + s, "localhost");
 

-               keeper[0] = "index-pack";
-               keeper[1] = "--stdin";
-               keeper[2] = "--fix-thin";
-               keeper[3] = hdr_arg;
-               keeper[4] = keep_arg;
-               keeper[5] = NULL;
+               keeper[i++] = "index-pack";
+               keeper[i++] = "--stdin";
+               if (receive_fsck_objects)
+                       keeper[i++] = "--strict";
+               keeper[i++] = "--fix-thin";
+               keeper[i++] = hdr_arg;
+               keeper[i++] = keep_arg;
+               keeper[i++] = NULL;

                memset(&ip, 0, sizeof(ip));
                ip.argv = keeper;
                ip.out = -1;
                memset(&ip, 0, sizeof(ip));
                ip.argv = keeper;
                ip.out = -1;