summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-04 11:11:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-04 11:11:06 (GMT)
commit9eb7a50b6ddb27250cf37a28c1d8181c33a733d3 (patch)
tree6543e750e9538f3e620d0d2d6851ba34babee1b6
parent27b4070e40a771c41ed581ef1ac98dd43e58ab87 (diff)
downloadgit-9eb7a50b6ddb27250cf37a28c1d8181c33a733d3.zip
git-9eb7a50b6ddb27250cf37a28c1d8181c33a733d3.tar.gz
git-9eb7a50b6ddb27250cf37a28c1d8181c33a733d3.tar.bz2
Revert "receive-pack: use strict mode for unpacking objects"
This reverts commit 28f72a0f232dfc71b3be726e7e71d0a6d5f9ebba.
-rw-r--r--Documentation/config.txt6
-rw-r--r--receive-pack.c36
2 files changed, 13 insertions, 29 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2091caa..4027726 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -939,12 +939,6 @@ imap::
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
diff --git a/receive-pack.c b/receive-pack.c
index de7e18c..f83ae87 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -10,7 +10,6 @@
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;
@@ -36,11 +35,6 @@ static int receive_pack_config(const char *var, const char *value)
return 0;
}
- if (strcmp(var, "receive.fsckobjects") == 0) {
- receive_fsck_objects = git_config_bool(var, value);
- return 0;
- }
-
return git_default_config(var, value);
}
@@ -374,13 +368,11 @@ static const char *unpack(void)
ntohl(hdr.hdr_version), ntohl(hdr.hdr_entries));
if (ntohl(hdr.hdr_entries) < unpack_limit) {
- 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;
+ int code;
+ const char *unpacker[3];
+ unpacker[0] = "unpack-objects";
+ unpacker[1] = hdr_arg;
+ unpacker[2] = NULL;
code = run_command_v_opt(unpacker, RUN_GIT_CMD);
switch (code) {
case 0:
@@ -401,8 +393,8 @@ static const char *unpack(void)
return "unpacker exited with error code";
}
} else {
- const char *keeper[7];
- int s, status, i = 0;
+ const char *keeper[6];
+ int s, status;
char keep_arg[256];
struct child_process ip;
@@ -410,14 +402,12 @@ static const char *unpack(void)
if (gethostname(keep_arg + s, sizeof(keep_arg) - s))
strcpy(keep_arg + s, "localhost");
- 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;
+ keeper[0] = "index-pack";
+ keeper[1] = "--stdin";
+ keeper[2] = "--fix-thin";
+ keeper[3] = hdr_arg;
+ keeper[4] = keep_arg;
+ keeper[5] = NULL;
memset(&ip, 0, sizeof(ip));
ip.argv = keeper;
ip.out = -1;