cmd_{read,write}_tree: rename "unused" variable that is used
authorJeff King <peff@peff.net>
Thu, 9 May 2019 21:27:24 +0000 (17:27 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 05:22:53 +0000 (14:22 +0900)
commit76a7bc092efc2be59f1e42dc437154a9a1feed0a
tree97585139b08f48b7a11b9ecef666ac30b3cc82e3
parent6a6c0f10a70a6eb101c213b09ae82a9cad252743
cmd_{read,write}_tree: rename "unused" variable that is used

The "prefix" variable passed by git.c into the builtin cmd_read_tree()
and cmd_write_tree() functions is named "unused_prefix". But we do in
fact pass it to parse_options(), which may use the prefix to adjust any
filename options. Let's get rid of this confusing name.

However, we can't just call it "prefix". The reason these variables were
renamed in the first place is that they shadowed local variables named
"prefix", because these commands both take a "--prefix" option.

So let's rename the parameters, but try to reduce further confusion:

  1. In both cases we'll call them "cmd_prefix" to mark that they're
     part of the cmd_* interface.

  2. In cmd_write_tree(), we'll rename the local prefix variable to
     "tree_prefix" to make it more clear that we're talking about the
     prefix to be used for the tree we're writing.

  3. In cmd_read_tree(), the "prefix" local has since migrated into
     "struct unpack_trees_options". We'll leave that alone, as the
     context within the struct makes its meaning clear (we actually
     _could_ just call the parameter "prefix" now, but that invites
     confusion in the other direction).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/read-tree.c
builtin/write-tree.c