Skip to content

Commit 840344d

Browse files
szedergitster
authored andcommitted
reflog: fix 'show' subcommand's argv
cmd_reflog() invokes parse_options() with PARSE_OPT_KEEP_ARGV0, but it doesn't account for the retained argv[0] before invoking cmd_reflog_show() to handle the 'git reflog show' subcommand. Consequently, cmd_reflog_show() always gets an 'argv' array starting with elements argv[0]="reflog" and argv[1]="show". Strip the name of the git command from the 'argv' array before passing it to the function handling the 'show' subcommand. There is no user-visible bug here, because cmd_reflog_show() doesn't have any options or parameters of its own. Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fbc15b1 commit 840344d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

builtin/reflog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static int cmd_reflog_show(int argc, const char **argv, const char *prefix)
225225
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0 |
226226
PARSE_OPT_KEEP_UNKNOWN);
227227

228-
return cmd_log_reflog(argc - 1, argv + 1, prefix);
228+
return cmd_log_reflog(argc, argv, prefix);
229229
}
230230

231231
static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
@@ -425,7 +425,7 @@ int cmd_reflog(int argc, const char **argv, const char *prefix)
425425
goto log_reflog;
426426

427427
if (!strcmp(argv[1], "show"))
428-
return cmd_reflog_show(argc, argv, prefix);
428+
return cmd_reflog_show(argc - 1, argv + 1, prefix);
429429
else if (!strcmp(argv[1], "expire"))
430430
return cmd_reflog_expire(argc - 1, argv + 1, prefix);
431431
else if (!strcmp(argv[1], "delete"))

0 commit comments

Comments
 (0)