Skip to content

Commit

Permalink
builtin-reflog.c: guard config parser from value=NULL
Browse files Browse the repository at this point in the history
gc.reflogexpire and gc.reflogexpireunreachable configuration expect
 a string value suitable for calling approxidate() with.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Feb 11, 2008
1 parent 995c452 commit 4f342b9
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions builtin-reflog.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,19 @@ static int collect_reflog(const char *ref, const unsigned char *sha1, int unused

static int reflog_expire_config(const char *var, const char *value)
{
if (!strcmp(var, "gc.reflogexpire"))
if (!strcmp(var, "gc.reflogexpire")) {
if (!value)
config_error_nonbool(var);
default_reflog_expire = approxidate(value);
else if (!strcmp(var, "gc.reflogexpireunreachable"))
return 0;
}
if (!strcmp(var, "gc.reflogexpireunreachable")) {
if (!value)
config_error_nonbool(var);
default_reflog_expire_unreachable = approxidate(value);
else
return git_default_config(var, value);
return 0;
return 0;
}
return git_default_config(var, value);
}

static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
Expand Down

0 comments on commit 4f342b9

Please sign in to comment.