Subject: Re: [PATCH] cmd_reset: don't trash uncommitted changes unless told to

From: Junio C Hamano <[email-masked]>
Date: Tue, 24 Jun 2008 15:31:31 -0700

Steven Walter <[email-masked]> writes:

> @@ -225,6 +243,10 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
>  	if (reset_type == HARD && is_bare_repository())
>  		die("hard reset makes no sense in a bare repository");
>  
> +        if (reset_type == HARD && !force && index_is_dirty()) {
> +                die("Uncommitted changes; re-run with -f to trash them");
> +        }
> +

Please don't.  With your change, does the testsuite even pass?

"reset --hard" has *ALWAYS* meant to be destructive --- discarding
potential local cruft is the whole point of the operation.

Learn the lingo, and get over it.