diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:17 -0800 |
| commit | 81ca93f1ce1f5e1ab0e88413914f5e9d23816e11 (patch) | |
| tree | 6d94d28ff3c699d5ba510f991e817214e2dca524 /builtin-reflog.c | |
| parent | Merge branch 'ml/maint-grep-doc' (diff) | |
| parent | reflog: honor gc.reflogexpire=never (diff) | |
| download | tgif-81ca93f1ce1f5e1ab0e88413914f5e9d23816e11.tar.xz | |
Merge branch 'as/maint-expire'
* as/maint-expire:
reflog: honor gc.reflogexpire=never
prune: honor --expire=never
Diffstat (limited to 'builtin-reflog.c')
| -rw-r--r-- | builtin-reflog.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin-reflog.c b/builtin-reflog.c index 749821078d..64e45bd813 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; |