kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

expire_reflog(): add a "flags" argument 

We want to separate the options relevant to the expiry machinery from
the options affecting the expiration policy. So add a "flags" argument
to expire_reflog() to hold the former.

The argument doesn't yet do anything.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2014-12-12 09:56:49 +01:00 committed by Junio C Hamano
parent c48a163535
commit aba56c89b2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/reflog.c
View File

@ -414,7 +414,7 @@ static void reflog_expiry_cleanup(struct expire_reflog_cb *cb)
} }


static int expire_reflog(const char *refname, const unsigned char *sha1, static int expire_reflog(const char *refname, const unsigned char *sha1,
struct cmd_reflog_expire_cb *cmd) unsigned int flags, struct cmd_reflog_expire_cb *cmd)
{ {
static struct lock_file reflog_lock; static struct lock_file reflog_lock;
struct expire_reflog_cb cb; struct expire_reflog_cb cb;
@ -642,6 +642,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
unsigned long now = time(NULL); unsigned long now = time(NULL);
int i, status, do_all; int i, status, do_all;
int explicit_expiry = 0; int explicit_expiry = 0;
unsigned int flags = 0;


default_reflog_expire_unreachable = now - 30 * 24 * 3600; default_reflog_expire_unreachable = now - 30 * 24 * 3600;
default_reflog_expire = now - 90 * 24 * 3600; default_reflog_expire = now - 90 * 24 * 3600;
@ -711,7 +712,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
for (i = 0; i < collected.nr; i++) { for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i]; struct collected_reflog *e = collected.e[i];
set_reflog_expiry_param(&cb, explicit_expiry, e->reflog); set_reflog_expiry_param(&cb, explicit_expiry, e->reflog);
status |= expire_reflog(e->reflog, e->sha1, &cb); status |= expire_reflog(e->reflog, e->sha1, flags, &cb);
free(e); free(e);
} }
free(collected.e); free(collected.e);
@ -725,7 +726,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
continue; continue;
} }
set_reflog_expiry_param(&cb, explicit_expiry, ref); set_reflog_expiry_param(&cb, explicit_expiry, ref);
status |= expire_reflog(ref, sha1, &cb); status |= expire_reflog(ref, sha1, flags, &cb);
} }
return status; return status;
} }
@ -744,6 +745,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
{ {
struct cmd_reflog_expire_cb cb; struct cmd_reflog_expire_cb cb;
int i, status = 0; int i, status = 0;
unsigned int flags = 0;


memset(&cb, 0, sizeof(cb)); memset(&cb, 0, sizeof(cb));


@ -796,7 +798,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
cb.expire_total = 0; cb.expire_total = 0;
} }


status |= expire_reflog(ref, sha1, &cb); status |= expire_reflog(ref, sha1, flags, &cb);
free(ref); free(ref);
} }
return status; return status;