Martin von Zweigbergk <martinvonz@xxxxxxxxx> writes:
> ---
> builtin/reset.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
With the patch that does not have any explicit check for bareness
nor new error message to scold user with, it is rather hard to tell
what is going on, without any description on what (if anything) is
broken at the end user level and what remedy is done about that
breakage...
>
> diff --git a/builtin/reset.c b/builtin/reset.c
> index 045c960..664fad9 100644
> --- a/builtin/reset.c
> +++ b/builtin/reset.c
> @@ -295,8 +295,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> else if (reset_type != NONE)
> die(_("Cannot do %s reset with paths."),
> _(reset_type_names[reset_type]));
> - return read_from_tree(pathspec, sha1,
> - quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
> }
> if (reset_type == NONE)
> reset_type = MIXED; /* by default */
> @@ -308,6 +306,10 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> die(_("%s reset is not allowed in a bare repository"),
> _(reset_type_names[reset_type]));
>
> + if (pathspec)
> + return read_from_tree(pathspec, sha1,
> + quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
> +
> /* Soft reset does not touch the index file nor the working tree
> * at all, but requires them in a good order. Other resets reset
> * the index file to the tree object we are switching to. */
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html