summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-08-07 18:20:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-07 20:31:52 (GMT)
commitf094b89a4d75216736830b5d2286ebc6846a25a9 (patch)
tree3855b27dd7bf66a62faf53c6c9a3fc70960560fe
parent8957661378b073b49875059d6426614facb0d7f0 (diff)
downloadgit-f094b89a4d75216736830b5d2286ebc6846a25a9.zip
git-f094b89a4d75216736830b5d2286ebc6846a25a9.tar.gz
git-f094b89a4d75216736830b5d2286ebc6846a25a9.tar.bz2
parse_decoration_style: drop unused argument `var`
The previous commit left it unused. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/log.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c
index c9564da..8a46cec 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -52,7 +52,7 @@ struct line_opt_callback_data {
struct string_list args;
};
-static int parse_decoration_style(const char *var, const char *value)
+static int parse_decoration_style(const char *value)
{
switch (git_parse_maybe_bool(value)) {
case 1:
@@ -76,7 +76,7 @@ static int decorate_callback(const struct option *opt, const char *arg, int unse
if (unset)
decoration_style = 0;
else if (arg)
- decoration_style = parse_decoration_style("command line", arg);
+ decoration_style = parse_decoration_style(arg);
else
decoration_style = DECORATE_SHORT_REFS;
@@ -401,7 +401,7 @@ static int git_log_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "log.date"))
return git_config_string(&default_date_mode, var, value);
if (!strcmp(var, "log.decorate")) {
- decoration_style = parse_decoration_style(var, value);
+ decoration_style = parse_decoration_style(value);
if (decoration_style < 0)
decoration_style = 0; /* maybe warn? */
return 0;