Since keeping a pushed pack or exploding it into loose objects should
be a local repository decision this teaches receive-pack to decide
if it should call unpack-objects or index-pack --stdin --fix-thin
based on the setting of receive.unpackLooseObjects.
If receive.unpackLooseObjects is true (which it is by default for
now) then we unpack-objects as we have in the past.
If it is false then we call index-pack and ask it to include our
pid and hostname in the .keep file to make it easier to identify
why a given pack has been kept in the repository.
Currently this leaves every received pack as a kept pack. We really
don't want that as received packs will tend to be small. Instead we
want to delete the .keep file automatically after all refs have
been updated. That is being left as room for future improvement.
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
Documentation/config.txt | 9 ++++++++-
cache.h | 1 +
receive-pack.c | 35 ++++++++++++++++++++++++++++++++---
sha1_file.c | 2 +-
4 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d9e73da..4eab9e8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -301,7 +301,14 @@ imap::
The configuration variables in the 'imap' section are described
in gitlink:git-imap-send[1].
-receive.denyNonFastforwads::
+receive.unpackLooseObjects::
+ If set to true, git-receive-pack will unpack each received
+ object into a loose object in the repository. If set to
+ false then the received pack file will be kept as is (but
+ may have delta bases appended onto the end). Large pushes
+ into a repository will generally go faster if this is false.
+
+receive.denyNonFastForwards::
If set to true, git-receive-pack will deny a ref update which is
not a fast forward. Use this to prevent such an update via a push,
even if that push is forced. This configuration variable is
diff --git a/cache.h b/cache.h
index e997a85..6cb7e1d 100644
--- a/cache.h
+++ b/cache.h
@@ -376,6 +376,7 @@ extern struct packed_git *parse_pack_ind
char *idx_path);
extern void prepare_packed_git(void);
+extern void reprepare_packed_git(void);
extern void install_packed_git(struct packed_git *pack);
extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
diff --git a/receive-pack.c b/receive-pack.c
index 7e154c5..6e377f0 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -7,9 +7,8 @@
static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
-static const char *unpacker[] = { "unpack-objects", NULL };
-
static int deny_non_fast_forwards = 0;
+static int unpack_loose_objects = 1;
static int report_status;
static char capabilities[] = "report-status";
@@ -25,6 +24,12 @@ static int receive_pack_config(const cha
return 0;
}
+ if (strcmp(var, "receive.unpacklooseobjects") == 0)
+ {
+ unpack_loose_objects = git_config_bool(var, value);
+ return 0;
+ }
+
return 0;
}
@@ -229,7 +234,31 @@ static void read_head_info(void)
static const char *unpack()
{
- int code = run_command_v_opt(1, unpacker, RUN_GIT_CMD);
+ static const char *unpacker[] = { "unpack-objects", NULL };
+ int code;
+
+ if (unpack_loose_objects)
+ code = run_command_v_opt(1, unpacker, RUN_GIT_CMD);
+ else {
+ const char *keeper[5], *why_kept;
+ char my_host[255], keep_arg[128 + 255];
+
+ if (gethostname(my_host, sizeof(my_host)))
+ strcpy(my_host, "localhost");
+ snprintf(keep_arg, sizeof(keep_why),
+ "--keep=receive-pack %i on %s",
+ getpid(), my_host);
+ why_kept = keep_arg + 7;
+
+ keeper[0] = "index-pack";
+ keeper[1] = "--stdin";
+ keeper[2] = "--fix-thin";
+ keeper[3] = keep_arg;
+ keeper[4] = NULL;
+ code = run_command_v_opt(1, keeper, RUN_GIT_CMD);
+ if (!code)
+ reprepare_packed_git();
+ }
switch (code) {
case 0:
diff --git a/sha1_file.c b/sha1_file.c
index 5e6c8b8..7bda2d4 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -663,7 +663,7 @@ void prepare_packed_git(void)
prepare_packed_git_run_once = 1;
}
-static void reprepare_packed_git(void)
+void reprepare_packed_git(void)
{
prepare_packed_git_run_once = 0;
prepare_packed_git();
--
1.4.3.3.g7d63
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html