Re: [PATCH] Hint at "checkout -p" in the "reset --patch <type>" error message

Jakub Narebski venit, vidit, dixit 25.11.2010 11:56:

Michael J Gruber [off-list ref] writes:

quoted

Štěpán Němec venit, vidit, dixit 23.11.2010 16:23:

quoted

Jeff King [off-list ref] writes:

quoted

On Tue, Nov 23, 2010 at 03:20:58PM +0100, Štěpán Němec wrote:

quoted

diff --git a/builtin/reset.c b/builtin/reset.c
index 0037be4..fc530d2 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c

@@ -309,7 +309,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 
 	if (patch_mode) {
 		if (reset_type != NONE)
-			die("--patch is incompatible with --{hard,mixed,soft}");
+			die("--patch is incompatible with --{hard,mixed,soft}\n"
+			    "(use \"git checkout -p\" to selectively discard changes in working directory)");
 		return interactive_reset(rev, argv + i, prefix);
 	}

[...]

quoted

The man page for git-reset points at git-checkout already.

Until we have a "verbosity level" config across all commands, I don't
favor adding a lot of hints to command error messages.

Errrr... but we do have "verbosity level" config in the form of
advice.* configuration variables.

...which is why I wrote "across all commands".

Introducing one config per advice does not scale at all. (Well, it
scales linearly...)

If we want our commands to give advice we need something like
"verbosity=silent|quiet|moderate|instructive|chatty" working across all
commands.

Michael