diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:12 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:12 +0900 |
commit | 4284497396eb52b2c096c2f442b70a52138b6e1b (patch) | |
tree | f4112d331419c9d0a59dc993e2f6638cd2f7fd8e /builtin/update-index.c | |
parent | Merge branch 'sg/test-atexit' (diff) | |
parent | parse_opt_ref_sorting: always use with NONEG flag (diff) | |
download | tgif-4284497396eb52b2c096c2f442b70a52138b6e1b.tar.xz |
Merge branch 'jk/unused-params-even-more'
Code cleanup.
* jk/unused-params-even-more:
parse_opt_ref_sorting: always use with NONEG flag
pretty: drop unused strbuf from parse_padding_placeholder()
pretty: drop unused "type" parameter in needs_rfc2047_encoding()
parse-options: drop unused ctx parameter from show_gitcomp()
fetch_pack(): drop unused parameters
report_path_error(): drop unused prefix parameter
unpack-trees: drop unused error_type parameters
unpack-trees: drop name_entry from traverse_by_cache_tree()
test-date: drop unused "now" parameter from parse_dates()
update-index: drop unused prefix_length parameter from do_reupdate()
log: drop unused "len" from show_tagger()
log: drop unused rev_info from early output
revision: drop some unused "revs" parameters
Diffstat (limited to 'builtin/update-index.c')
-rw-r--r-- | builtin/update-index.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index 73fe04e1c2..890c251d66 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -724,7 +724,7 @@ static int do_unresolve(int ac, const char **av, } static int do_reupdate(int ac, const char **av, - const char *prefix, int prefix_length) + const char *prefix) { /* Read HEAD and run update-index on paths that are * merged and already different between index and HEAD. @@ -940,8 +940,7 @@ static enum parse_opt_result reupdate_callback( /* consume remaining arguments. */ setup_work_tree(); - *has_errors = do_reupdate(ctx->argc, ctx->argv, - prefix, prefix ? strlen(prefix) : 0); + *has_errors = do_reupdate(ctx->argc, ctx->argv, prefix); if (*has_errors) active_cache_changed = 0; |