Junio C Hamano wrote:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> ... as you suggested, I think mimicking how existing commands with
>> "--no-<option>" are shown, e.g. builtlin/update-ref.c does
>> "--no-deref",
>>
>> $ git update-ref -h 2>&1 | grep deref
>> --no-deref update <refname> not the one it points to
>> $ git grep 'OPT_BOOL.*"no-deref"'
>> builtin/update-ref.c: OPT_BOOL( 0 , "no-deref", &no_deref,
>>
>> would be a good approach.
>>
>>> The range-diff for the other changes looks good
>>
>> Thanks.
>>
>> #leftoverbit: we may want to discuss if it is a good idea to teach
>> OPT_BOOL() to list "--[no-]<option>" in "git cmd -h", instead of
>> just "--<option>".
>
>
> Unfortunately, I merged these already to 'next' before seeing your
> comment, so we'd need to go incremental.
>
> How about this?
>
> ----- >8 --------- >8 --------- >8 --------- >8 -----
> Subject: [PATCH] reset: show --no-refresh in the short-help
>
> In the short help output from "git reset -h", the recently added
> "--[no-]refresh" option is shown like so:
>
> --refresh skip refreshing the index after reset
>
> which explains what happens when the option is given in the negative
> form, i.e. "--no-refresh". We could rephrase the explanation to
> read "refresh the index after reset (default)" to hint that the user
> can say "--no-refresh" to override the default, but listing the
> "--no-refresh" form in the list of options would be more helpful.
>
> Helped-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> ---
> builtin/reset.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git c/builtin/reset.c w/builtin/reset.c
> index 1d89faef5e..344fff8f3a 100644
> --- c/builtin/reset.c
> +++ w/builtin/reset.c
> @@ -392,7 +392,7 @@ static int git_reset_config(const char *var, const char *value, void *cb)
> int cmd_reset(int argc, const char **argv, const char *prefix)
> {
> int reset_type = NONE, update_ref_status = 0, quiet = 0;
> - int refresh = 1;
> + int no_refresh = 0;
> int patch_mode = 0, pathspec_file_nul = 0, unborn;
> const char *rev, *pathspec_from_file = NULL;
> struct object_id oid;
> @@ -400,7 +400,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> int intent_to_add = 0;
> const struct option options[] = {
> OPT__QUIET(&quiet, N_("be quiet, only report errors")),
> - OPT_BOOL(0, "refresh", &refresh,
> + OPT_BOOL(0, "no-refresh", &no_refresh,
> N_("skip refreshing the index after reset")),
> OPT_SET_INT(0, "mixed", &reset_type,
> N_("reset HEAD and index"), MIXED),
> @@ -519,7 +519,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> if (read_from_tree(&pathspec, &oid, intent_to_add))
> return 1;
> the_index.updated_skipworktree = 1;
> - if (refresh && get_git_work_tree()) {
> + if (!no_refresh && get_git_work_tree()) {
> uint64_t t_begin, t_delta_in_ms;
>
> t_begin = getnanotime();
This looks good to me, and it's passing all of the relevant tests. Thank you
both for your help with this!
