Merge branch 'maint'

* maint:
show-branch: Fix die message in parse_reflog_param()

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 828e6f86de22f8def68a49b702a27521c248a012..c3afabbe914d699a8e0c80bdb5063ca51506167e 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -576,7 +576,7 @@ static void parse_reflog_param(const char *arg, int *cnt, const char **base)
        if (*ep == ',')
                *base = ep + 1;
        else if (*ep)
-               die("unrecognized reflog param '%s'", arg + 9);
+               die("unrecognized reflog param '%s'", arg);
        else
                *base = NULL;
        if (*cnt <= 0)