update-index: drop unused argc from do_reupdate()

The parse-options callback for --again soaks up all remaining options by manipulating the parse_opt_ctx's argc and argv fields. Even though it has to look at both, the actual parsing happens via the do_reupdate() helper, which only looks at the argv half (by passing it along to parse_pathspec). So that helper doesn't need to see argc at all. Note that the helper does look at "argv + 1" without confirming that argc is greater than 0. We know this is correct because it is skipping past the actual "--again" string, which will always be present. However, to make what's going on more obvious, let's move that "+1" into the caller, which has the matching "-1" when fixing up the ctx's argc/argv. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 17, 2022 at 21:04 UTC 827f8305c4d5a0300c669dc57cc2920537bba757
1 file changed +3 -3
builtin/update-index.c
+3 -3
@@ -732,7 +732,7 @@ static int do_unresolve(int ac, const char **av,
732 return err;
733 }
734
735 -static int do_reupdate(int ac, const char **av,
735 +static int do_reupdate(const char **paths,
736 const char *prefix)
737 {
738 /* Read HEAD and run update-index on paths that are
@@ -744,7 +744,7 @@ static int do_reupdate(int ac, const char **av,
744
745 parse_pathspec(&pathspec, 0,
746 PATHSPEC_PREFER_CWD,
747 - prefix, av + 1);
747 + prefix, paths);
748
749 if (read_ref("HEAD", &head_oid))
750 /* If there is no HEAD, that means it is an initial
@@ -970,7 +970,7 @@ static enum parse_opt_result reupdate_callback(
970
971 /* consume remaining arguments. */
972 setup_work_tree();
973 - *has_errors = do_reupdate(ctx->argc, ctx->argv, prefix);
973 + *has_errors = do_reupdate(ctx->argv + 1, prefix);
974 if (*has_errors)
975 active_cache_changed = 0;
976