This option specifies the minimum age of an object before it
may be removed by prune. The default value is 2 hours and
may be changed using gc.pruneexpire.
Signed-off-by: Matthias Lederhofer <matled@xxxxxxx>
---
Shawn O. Pearce <spearce@xxxxxxxxxxx> wrote:
> If you are going to implement this I would suggest making the default
> age 2 hours and allow the user to configure it from a gc.pruneexpire
> configuration option, much like gc.reflogexpire.
Here it is, I've set the default value to 2 hours as you suggested.
Any other comments if the default should be a value >0 or 0 to keep
the old behaviour?
---
builtin-prune.c | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/builtin-prune.c b/builtin-prune.c
index 6f0ba0d..f46892d 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -5,8 +5,10 @@
#include "builtin.h"
#include "reachable.h"
-static const char prune_usage[] = "git-prune [-n]";
+static const char prune_usage[] = "git-prune [-n] [--expire=seconds]";
static int show_only;
+static int prune_expire;
+static time_t now;
static int prune_object(char *path, const char *filename, const unsigned char *sha1)
{
@@ -38,6 +40,7 @@ static int prune_dir(int i, char *path)
char name[100];
unsigned char sha1[20];
int len = strlen(de->d_name);
+ struct stat st;
switch (len) {
case 2:
@@ -60,6 +63,11 @@ static int prune_dir(int i, char *path)
if (lookup_object(sha1))
continue;
+ if (prune_expire > 0 &&
+ !stat(mkpath("%s/%s", path, de->d_name), &st) &&
+ now-st.st_mtime < prune_expire)
+ continue;
+
prune_object(path, de->d_name, sha1);
continue;
}
@@ -79,10 +87,21 @@ static void prune_object_dir(const char *path)
}
}
+static void git_prune_config(const char *var, const char *value)
+{
+ if (!strcmp(var, "gc.pruneexpire")) {
+ prune_expire = git_config_int(var, value);
+ return 0;
+ }
+ return git_default_config(var, value);
+}
+
int cmd_prune(int argc, const char **argv, const char *prefix)
{
int i;
struct rev_info revs;
+ prune_expire = 2*60*60;
+ now = time(NULL);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
@@ -90,6 +109,10 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
show_only = 1;
continue;
}
+ if (!strncmp(arg, "--expire=", 9)) {
+ prune_expire = atoi(arg+9);
+ continue;
+ }
usage(prune_usage);
}
--
1.4.4.4
-
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