* [PATCH] prune: honor --expire=never
@ 2010-02-26 21:59 Adam Simpkins
2010-02-27 0:07 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Adam Simpkins @ 2010-02-26 21:59 UTC (permalink / raw)
To: git, gitster
Previously, prune treated an expiration time of 0 to mean that no
expire argument was supplied, and everything should be pruned. As a
result, "prune --expire=never" would prune all unreachable objects,
regardless of their timestamps.
prune can be called with --expire=never automatically by gc, when the
gc.pruneExpire configuration is set to "never".
Signed-off-by: Adam Simpkins <simpkins@facebook.com>
---
builtin-prune.c | 7 +++++--
t/t5304-prune.sh | 32 ++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/builtin-prune.c b/builtin-prune.c
index 4675f60..ce43271 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -7,6 +7,8 @@
#include "parse-options.h"
#include "dir.h"
+#define ALWAYS_EXPIRE ((unsigned int)-1)
+
static const char * const prune_usage[] = {
"git prune [-n] [-v] [--expire <time>] [--] [<head>...]",
NULL
@@ -18,7 +20,7 @@ static unsigned long expire;
static int prune_tmp_object(const char *path, const char *filename)
{
const char *fullpath = mkpath("%s/%s", path, filename);
- if (expire) {
+ if (expire != ALWAYS_EXPIRE) {
struct stat st;
if (lstat(fullpath, &st))
return error("Could not stat '%s'", fullpath);
@@ -34,7 +36,7 @@ static int prune_tmp_object(const char *path, const char *filename)
static int prune_object(char *path, const char *filename, const unsigned char *sha1)
{
const char *fullpath = mkpath("%s/%s", path, filename);
- if (expire) {
+ if (expire != ALWAYS_EXPIRE) {
struct stat st;
if (lstat(fullpath, &st))
return error("Could not stat '%s'", fullpath);
@@ -139,6 +141,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
};
char *s;
+ expire = ALWAYS_EXPIRE;
save_commit_buffer = 0;
read_replace_refs = 0;
init_revisions(&revs, prefix);
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 3c6687a..e2ed13d 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -148,6 +148,38 @@ test_expect_success 'gc --prune=<date>' '
'
+test_expect_success 'gc --prune=never' '
+
+ add_blob &&
+ git gc --prune=never &&
+ test -f $BLOB_FILE &&
+ git gc --prune=now &&
+ test ! -f $BLOB_FILE
+
+'
+
+test_expect_success 'gc respects gc.pruneExpire=never' '
+
+ git config gc.pruneExpire never &&
+ add_blob &&
+ git gc &&
+ test -f $BLOB_FILE &&
+ git config gc.pruneExpire now &&
+ git gc &&
+ test ! -f $BLOB_FILE
+
+'
+
+test_expect_success 'prune --expire=never' '
+
+ add_blob &&
+ git prune --expire=never &&
+ test -f $BLOB_FILE &&
+ git prune &&
+ test ! -f $BLOB_FILE
+
+'
+
test_expect_success 'gc: prune old objects after local clone' '
add_blob &&
test-chmtime =-$((2*$week+1)) $BLOB_FILE &&
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] prune: honor --expire=never
2010-02-26 21:59 [PATCH] prune: honor --expire=never Adam Simpkins
@ 2010-02-27 0:07 ` Junio C Hamano
2010-02-27 1:21 ` Adam Simpkins
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2010-02-27 0:07 UTC (permalink / raw)
To: Adam Simpkins; +Cc: git
Adam Simpkins <simpkins@facebook.com> writes:
> diff --git a/builtin-prune.c b/builtin-prune.c
> index 4675f60..ce43271 100644
> --- a/builtin-prune.c
> +++ b/builtin-prune.c
> @@ -7,6 +7,8 @@
> #include "parse-options.h"
> #include "dir.h"
>
> +#define ALWAYS_EXPIRE ((unsigned int)-1)
> ...
> @@ -34,7 +36,7 @@ static int prune_tmp_object(const char *path, const char *filename)
> static int prune_object(char *path, const char *filename, const unsigned char *sha1)
> {
> const char *fullpath = mkpath("%s/%s", path, filename);
> - if (expire) {
> + if (expire != ALWAYS_EXPIRE) {
Wouldn't it be a lot simpler to initialize expire to "now" for the default
case, and remove all these "if (expire)"? I think that is how the logic
to expire reflog entries work, which I think is saner.
While you are at it, you might want to think about a way to unify what
parse_opt_approxidate_cb() and parse_expire_cfg_value() do. The latter
knows about "expire = false" but the former doesn't, which is a slight
inconsistency.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] prune: honor --expire=never
2010-02-27 0:07 ` Junio C Hamano
@ 2010-02-27 1:21 ` Adam Simpkins
2010-02-27 3:50 ` [PATCH 1/3] " Adam Simpkins
0 siblings, 1 reply; 6+ messages in thread
From: Adam Simpkins @ 2010-02-27 1:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Fri, Feb 26, 2010 at 04:07:45PM -0800, Junio C Hamano wrote:
> Adam Simpkins <simpkins@facebook.com> writes:
>
> > diff --git a/builtin-prune.c b/builtin-prune.c
> > index 4675f60..ce43271 100644
> > --- a/builtin-prune.c
> > +++ b/builtin-prune.c
> > @@ -7,6 +7,8 @@
> > #include "parse-options.h"
> > #include "dir.h"
> >
> > +#define ALWAYS_EXPIRE ((unsigned int)-1)
> > ...
> > @@ -34,7 +36,7 @@ static int prune_tmp_object(const char *path, const char *filename)
> > static int prune_object(char *path, const char *filename, const unsigned char *sha1)
> > {
> > const char *fullpath = mkpath("%s/%s", path, filename);
> > - if (expire) {
> > + if (expire != ALWAYS_EXPIRE) {
>
> Wouldn't it be a lot simpler to initialize expire to "now" for the default
> case, and remove all these "if (expire)"?
Sure, I can submit an updated patch to do that. It does slightly
change the behavior of "git prune" with no --expire argument though:
- Objects with an mtime in the future will no longer be pruned.
- We'll call lstat() all of the unreachable objects, even though it
isn't really necessary.
However, the code is indeed simpler, if you don't think either of
these changes matter.
> I think that is how the logic
> to expire reflog entries work, which I think is saner.
Hmm. reflog appears to have the same bug when parsing the
gc.reflogexpire and gc.reflogexpireunreachable options. Setting
either of these to "never" or "false" results in the default
expiration time. (However, using --expire=never on the command line
works correctly.)
I'll submit a separate patch for that.
> While you are at it, you might want to think about a way to unify what
> parse_opt_approxidate_cb() and parse_expire_cfg_value() do. The latter
> knows about "expire = false" but the former doesn't, which is a slight
> inconsistency.
Sure, I'll look into it and submit a patch.
--
Adam Simpkins
simpkins@facebook.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] prune: honor --expire=never
2010-02-27 1:21 ` Adam Simpkins
@ 2010-02-27 3:50 ` Adam Simpkins
2010-02-27 3:50 ` [PATCH 2/3] reflog: honor gc.reflogexpire=never Adam Simpkins
0 siblings, 1 reply; 6+ messages in thread
From: Adam Simpkins @ 2010-02-27 3:50 UTC (permalink / raw)
To: git, gitster; +Cc: Adam Simpkins
Previously, prune treated an expiration time of 0 to mean that no
expire argument was supplied, and everything should be pruned. As a
result, "prune --expire=never" would prune all unreachable objects,
regardless of their timestamp.
prune can be called with --expire=never automatically by gc, when the
gc.pruneExpire configuration is set to "never".
Signed-off-by: Adam Simpkins <simpkins@facebook.com>
---
builtin-prune.c | 25 +++++++++++--------------
t/t5304-prune.sh | 32 ++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/builtin-prune.c b/builtin-prune.c
index 4675f60..f22bcf6 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -18,13 +18,11 @@ static unsigned long expire;
static int prune_tmp_object(const char *path, const char *filename)
{
const char *fullpath = mkpath("%s/%s", path, filename);
- if (expire) {
- struct stat st;
- if (lstat(fullpath, &st))
- return error("Could not stat '%s'", fullpath);
- if (st.st_mtime > expire)
- return 0;
- }
+ struct stat st;
+ if (lstat(fullpath, &st))
+ return error("Could not stat '%s'", fullpath);
+ if (st.st_mtime > expire)
+ return 0;
printf("Removing stale temporary file %s\n", fullpath);
if (!show_only)
unlink_or_warn(fullpath);
@@ -34,13 +32,11 @@ static int prune_tmp_object(const char *path, const char *filename)
static int prune_object(char *path, const char *filename, const unsigned char *sha1)
{
const char *fullpath = mkpath("%s/%s", path, filename);
- if (expire) {
- struct stat st;
- if (lstat(fullpath, &st))
- return error("Could not stat '%s'", fullpath);
- if (st.st_mtime > expire)
- return 0;
- }
+ struct stat st;
+ if (lstat(fullpath, &st))
+ return error("Could not stat '%s'", fullpath);
+ if (st.st_mtime > expire)
+ return 0;
if (show_only || verbose) {
enum object_type type = sha1_object_info(sha1, NULL);
printf("%s %s\n", sha1_to_hex(sha1),
@@ -139,6 +135,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
};
char *s;
+ expire = (unsigned long)-1;
save_commit_buffer = 0;
read_replace_refs = 0;
init_revisions(&revs, prefix);
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 3c6687a..e2ed13d 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -148,6 +148,38 @@ test_expect_success 'gc --prune=<date>' '
'
+test_expect_success 'gc --prune=never' '
+
+ add_blob &&
+ git gc --prune=never &&
+ test -f $BLOB_FILE &&
+ git gc --prune=now &&
+ test ! -f $BLOB_FILE
+
+'
+
+test_expect_success 'gc respects gc.pruneExpire=never' '
+
+ git config gc.pruneExpire never &&
+ add_blob &&
+ git gc &&
+ test -f $BLOB_FILE &&
+ git config gc.pruneExpire now &&
+ git gc &&
+ test ! -f $BLOB_FILE
+
+'
+
+test_expect_success 'prune --expire=never' '
+
+ add_blob &&
+ git prune --expire=never &&
+ test -f $BLOB_FILE &&
+ git prune &&
+ test ! -f $BLOB_FILE
+
+'
+
test_expect_success 'gc: prune old objects after local clone' '
add_blob &&
test-chmtime =-$((2*$week+1)) $BLOB_FILE &&
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] reflog: honor gc.reflogexpire=never
2010-02-27 3:50 ` [PATCH 1/3] " Adam Simpkins
@ 2010-02-27 3:50 ` Adam Simpkins
2010-02-27 3:50 ` [PATCH 3/3] clean up parsing of expiration dates Adam Simpkins
0 siblings, 1 reply; 6+ messages in thread
From: Adam Simpkins @ 2010-02-27 3:50 UTC (permalink / raw)
To: git, gitster; +Cc: Adam Simpkins
Previously, if gc.reflogexpire or gc.reflogexpire were set to "never"
or "false", the builtin default values were used instead.
Signed-off-by: Adam Simpkins <simpkins@facebook.com>
---
builtin-reflog.c | 6 ++----
t/t1410-reflog.sh | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/builtin-reflog.c b/builtin-reflog.c
index 7498210..64e45bd 100644
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -530,16 +530,14 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
int i, status, do_all;
int explicit_expiry = 0;
+ default_reflog_expire_unreachable = now - 30 * 24 * 3600;
+ default_reflog_expire = now - 90 * 24 * 3600;
git_config(reflog_expire_config, NULL);
save_commit_buffer = 0;
do_all = status = 0;
memset(&cb, 0, sizeof(cb));
- if (!default_reflog_expire_unreachable)
- default_reflog_expire_unreachable = now - 30 * 24 * 3600;
- if (!default_reflog_expire)
- default_reflog_expire = now - 90 * 24 * 3600;
cb.expire_total = default_reflog_expire;
cb.expire_unreachable = default_reflog_expire_unreachable;
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 80af6b9..25046c4 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -214,4 +214,45 @@ test_expect_success 'delete' '
'
+test_expect_success 'rewind2' '
+
+ test_tick && git reset --hard HEAD~2 &&
+ loglen=$(wc -l <.git/logs/refs/heads/master) &&
+ test $loglen = 4
+
+'
+
+test_expect_success '--expire=never' '
+
+ git reflog expire --verbose \
+ --expire=never \
+ --expire-unreachable=never \
+ --all &&
+ loglen=$(wc -l <.git/logs/refs/heads/master) &&
+ test $loglen = 4
+
+'
+
+test_expect_success 'gc.reflogexpire=never' '
+
+ git config gc.reflogexpire never &&
+ git config gc.reflogexpireunreachable never &&
+ git reflog expire --verbose --all &&
+ loglen=$(wc -l <.git/logs/refs/heads/master) &&
+ test $loglen = 4
+'
+
+test_expect_success 'gc.reflogexpire=false' '
+
+ git config gc.reflogexpire false &&
+ git config gc.reflogexpireunreachable false &&
+ git reflog expire --verbose --all &&
+ loglen=$(wc -l <.git/logs/refs/heads/master) &&
+ test $loglen = 4 &&
+
+ git config --unset gc.reflogexpire &&
+ git config --unset gc.reflogexpireunreachable
+
+'
+
test_done
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] clean up parsing of expiration dates
2010-02-27 3:50 ` [PATCH 2/3] reflog: honor gc.reflogexpire=never Adam Simpkins
@ 2010-02-27 3:50 ` Adam Simpkins
0 siblings, 0 replies; 6+ messages in thread
From: Adam Simpkins @ 2010-02-27 3:50 UTC (permalink / raw)
To: git, gitster; +Cc: Adam Simpkins
The gc, prune, and reflog command all take arguments that control
expiring of old objects/log entries. This cleans up the parsing of
these arguments, and centralizes the logic so the commands behave
consistently.
Two new functions have been added for parsing expiration dates:
parse_expire_date() is similar to approxidate_careful(), but also
accepts the value "false" as a synonym for "never".
git_config_expire_date() calls parse_expire_date(), and prints an
error message if the value is invalid. A new OPT_EXPIRE_DATE option
type has also been added to parse-options.h for parsing expiration
date command line arguments.
Signed-off-by: Adam Simpkins <simpkins@facebook.com>
---
builtin-gc.c | 9 ++++-----
builtin-prune.c | 4 ++--
builtin-reflog.c | 27 +++++++++++----------------
cache.h | 2 ++
config.c | 12 ++++++++++++
date.c | 10 ++++++++++
parse-options.c | 17 +++++++++++++++++
parse-options.h | 4 ++++
t/t1410-reflog.sh | 11 +++++++++++
t/t5304-prune.sh | 36 +++++++++++++++++++++++++++++++++++-
10 files changed, 108 insertions(+), 24 deletions(-)
diff --git a/builtin-gc.c b/builtin-gc.c
index c304638..3921e6e 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -57,11 +57,10 @@ static int gc_config(const char *var, const char *value, void *cb)
return 0;
}
if (!strcmp(var, "gc.pruneexpire")) {
- if (value && strcmp(value, "now")) {
- unsigned long now = approxidate("now");
- if (approxidate(value) >= now)
- return error("Invalid %s: '%s'", var, value);
- }
+ /* Make sure the value is valid */
+ unsigned long expire_date;
+ if (git_config_expire_date(&expire_date, var, value))
+ return -1;
return git_config_string(&prune_expire, var, value);
}
return git_default_config(var, value, cb);
diff --git a/builtin-prune.c b/builtin-prune.c
index f22bcf6..e8d25a6 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -129,8 +129,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
"do not remove, show only"),
OPT_BOOLEAN('v', NULL, &verbose,
"report pruned objects"),
- OPT_DATE(0, "expire", &expire,
- "expire objects older than <time>"),
+ OPT_EXPIRE_DATE(0, "expire", &expire,
+ "expire objects older than <time>"),
OPT_END()
};
char *s;
diff --git a/builtin-reflog.c b/builtin-reflog.c
index 64e45bd..2d2a9aa 100644
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -425,18 +425,6 @@ static struct reflog_expire_cfg *find_cfg_ent(const char *pattern, size_t len)
return ent;
}
-static int parse_expire_cfg_value(const char *var, const char *value, unsigned long *expire)
-{
- if (!value)
- return config_error_nonbool(var);
- if (!strcmp(value, "never") || !strcmp(value, "false")) {
- *expire = 0;
- return 0;
- }
- *expire = approxidate(value);
- return 0;
-}
-
/* expiry timer slot */
#define EXPIRE_TOTAL 01
#define EXPIRE_UNREACH 02
@@ -453,11 +441,11 @@ static int reflog_expire_config(const char *var, const char *value, void *cb)
if (!strcmp(lastdot, ".reflogexpire")) {
slot = EXPIRE_TOTAL;
- if (parse_expire_cfg_value(var, value, &expire))
+ if (git_config_expire_date(&expire, var, value))
return -1;
} else if (!strcmp(lastdot, ".reflogexpireunreachable")) {
slot = EXPIRE_UNREACH;
- if (parse_expire_cfg_value(var, value, &expire))
+ if (git_config_expire_date(&expire, var, value))
return -1;
} else
return git_default_config(var, value, cb);
@@ -546,11 +534,18 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
cb.dry_run = 1;
else if (!prefixcmp(arg, "--expire=")) {
- cb.expire_total = approxidate(arg + 9);
+ if (git_config_expire_date(&cb.expire_total,
+ "--expire", arg + 9)) {
+ usage(reflog_expire_usage);
+ }
explicit_expiry |= EXPIRE_TOTAL;
}
else if (!prefixcmp(arg, "--expire-unreachable=")) {
- cb.expire_unreachable = approxidate(arg + 21);
+ if (git_config_expire_date(&cb.expire_unreachable,
+ "--expire-unreachable",
+ arg + 21)) {
+ usage(reflog_expire_usage);
+ }
explicit_expiry |= EXPIRE_UNREACH;
}
else if (!strcmp(arg, "--stale-fix"))
diff --git a/cache.h b/cache.h
index d478eff..981987e 100644
--- a/cache.h
+++ b/cache.h
@@ -766,6 +766,7 @@ void datestamp(char *buf, int bufsize);
unsigned long approxidate_careful(const char *, int *);
unsigned long approxidate_relative(const char *date, const struct timeval *now);
enum date_mode parse_date_format(const char *format);
+unsigned long parse_expire_date(const char *value, int *error_ret);
#define IDENT_WARN_ON_NO_NAME 1
#define IDENT_ERROR_ON_NO_NAME 2
@@ -926,6 +927,7 @@ extern int git_config_bool_or_int(const char *, const char *, int *);
extern int git_config_bool(const char *, const char *);
extern int git_config_string(const char **, const char *, const char *);
extern int git_config_pathname(const char **, const char *, const char *);
+extern int git_config_expire_date(unsigned long *, const char *, const char *);
extern int git_config_set(const char *, const char *);
extern int git_config_set_multivar(const char *, const char *, const char *, int);
extern int git_config_rename_section(const char *, const char *);
diff --git a/config.c b/config.c
index 6963fbe..47df868 100644
--- a/config.c
+++ b/config.c
@@ -361,6 +361,18 @@ int git_config_pathname(const char **dest, const char *var, const char *value)
return 0;
}
+int git_config_expire_date(unsigned long *dest, const char *var, const char *value)
+{
+ if (!value)
+ return config_error_nonbool(var);
+ int error_code = 0;
+ *dest = parse_expire_date(value, &error_code);
+ if (error_code) {
+ return error("Invalid value for %s: '%s'", var, value);
+ }
+ return 0;
+}
+
static int git_default_core_config(const char *var, const char *value)
{
/* This needs a better name */
diff --git a/date.c b/date.c
index 002aa3c..1191c9d 100644
--- a/date.c
+++ b/date.c
@@ -673,6 +673,16 @@ void datestamp(char *buf, int bufsize)
date_string(now, offset, buf, bufsize);
}
+unsigned long parse_expire_date(const char *value, int *error_ret)
+{
+ if (!strcmp(value, "never") || !strcmp(value, "false")) {
+ if (error_ret)
+ *error_ret = 0;
+ return 0;
+ }
+ return approxidate_careful(value, error_ret);
+}
+
/*
* Relative time update (eg "2 days ago"). If we haven't set the time
* yet, we need to set it from current time.
diff --git a/parse-options.c b/parse-options.c
index d218122..431d367 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -599,6 +599,23 @@ int parse_opt_approxidate_cb(const struct option *opt, const char *arg,
return 0;
}
+int parse_opt_expire_date_cb(const struct option *opt, const char *arg,
+ int unset)
+{
+ int error_code = 0;
+
+ if (unset) {
+ *(unsigned long *)(opt->value) = 0;
+ return 0;
+ }
+
+ *(unsigned long *)(opt->value) = parse_expire_date(arg, &error_code);
+ if (error_code) {
+ return opterror(opt, "expects a date or \"false\"", 0);
+ }
+ return 0;
+}
+
int parse_opt_verbosity_cb(const struct option *opt, const char *arg,
int unset)
{
diff --git a/parse-options.h b/parse-options.h
index 0c99691..8f446cc 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -128,6 +128,9 @@ struct option {
#define OPT_DATE(s, l, v, h) \
{ OPTION_CALLBACK, (s), (l), (v), "time",(h), 0, \
parse_opt_approxidate_cb }
+#define OPT_EXPIRE_DATE(s, l, v, h) \
+ { OPTION_CALLBACK, (s), (l), (v), "time",(h), 0, \
+ parse_opt_expire_date_cb }
#define OPT_CALLBACK(s, l, v, a, h, f) \
{ OPTION_CALLBACK, (s), (l), (v), (a), (h), 0, (f) }
#define OPT_NUMBER_CALLBACK(v, h, f) \
@@ -187,6 +190,7 @@ extern int parse_options_end(struct parse_opt_ctx_t *ctx);
/*----- some often used options -----*/
extern int parse_opt_abbrev_cb(const struct option *, const char *, int);
extern int parse_opt_approxidate_cb(const struct option *, const char *, int);
+extern int parse_opt_expire_date_cb(const struct option *, const char *, int);
extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
extern int parse_opt_with_commit(const struct option *, const char *, int);
extern int parse_opt_tertiary(const struct option *, const char *, int);
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 25046c4..d6641fa 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -233,6 +233,17 @@ test_expect_success '--expire=never' '
'
+test_expect_success '--expire=false' '
+
+ git reflog expire --verbose \
+ --expire=false \
+ --expire-unreachable=false \
+ --all &&
+ loglen=$(wc -l <.git/logs/refs/heads/master) &&
+ test $loglen = 4
+
+'
+
test_expect_success 'gc.reflogexpire=never' '
git config gc.reflogexpire never &&
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index e2ed13d..43e5b1d 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -166,7 +166,21 @@ test_expect_success 'gc respects gc.pruneExpire=never' '
test -f $BLOB_FILE &&
git config gc.pruneExpire now &&
git gc &&
- test ! -f $BLOB_FILE
+ test ! -f $BLOB_FILE &&
+ git config --unset gc.pruneExpire
+
+'
+
+test_expect_success 'gc respects gc.pruneExpire=false' '
+
+ git config gc.pruneExpire false &&
+ add_blob &&
+ git gc &&
+ test -f $BLOB_FILE &&
+ git config gc.pruneExpire now &&
+ git gc &&
+ test ! -f $BLOB_FILE &&
+ git config --unset gc.pruneExpire
'
@@ -180,6 +194,26 @@ test_expect_success 'prune --expire=never' '
'
+test_expect_success 'prune --expire=false' '
+
+ add_blob &&
+ git prune --expire=false &&
+ test -f $BLOB_FILE &&
+ git prune &&
+ test ! -f $BLOB_FILE
+
+'
+
+test_expect_success 'prune --no-expire' '
+
+ add_blob &&
+ git prune --no-expire &&
+ test -f $BLOB_FILE &&
+ git prune &&
+ test ! -f $BLOB_FILE
+
+'
+
test_expect_success 'gc: prune old objects after local clone' '
add_blob &&
test-chmtime =-$((2*$week+1)) $BLOB_FILE &&
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-02-27 3:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-26 21:59 [PATCH] prune: honor --expire=never Adam Simpkins
2010-02-27 0:07 ` Junio C Hamano
2010-02-27 1:21 ` Adam Simpkins
2010-02-27 3:50 ` [PATCH 1/3] " Adam Simpkins
2010-02-27 3:50 ` [PATCH 2/3] reflog: honor gc.reflogexpire=never Adam Simpkins
2010-02-27 3:50 ` [PATCH 3/3] clean up parsing of expiration dates Adam Simpkins
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.