Merge branch 'maint'

* maint:
  show-branch: Fix die message in parse_reflog_param()
This commit is contained in:
Junio C Hamano 2009-05-18 08:59:20 -07:00
commit 59e5fb356e

View File

@ -576,7 +576,7 @@ static void parse_reflog_param(const char *arg, int *cnt, const char **base)
if (*ep == ',') if (*ep == ',')
*base = ep + 1; *base = ep + 1;
else if (*ep) else if (*ep)
die("unrecognized reflog param '%s'", arg + 9); die("unrecognized reflog param '%s'", arg);
else else
*base = NULL; *base = NULL;
if (*cnt <= 0) if (*cnt <= 0)