From: Christian Couder Date: Wed, 30 Dec 2009 05:54:44 +0000 (+0100) Subject: reset: improve mixed reset error message when in a bare repo X-Git-Tag: v1.7.0-rc0~98^2~8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b06b0a02f8d0aa01c8ff19b72c9292afd7a84fe;p=git.git reset: improve mixed reset error message when in a bare repo When running a "git reset --mixed" in a bare repository, the message displayed is something like: fatal: This operation must be run in a work tree fatal: Could not reset index file to revision 'HEAD^'. This message is a little bit misleading because a mixed reset is ok in a git directory, so it is not absolutely needed to run it in a work tree. So this patch improves upon the above by changing the message to: fatal: mixed reset is not allowed in a bare repository And if "git reset" is ever sped up by using unpack_tree() directly (instead of execing "git read-tree"), this patch will also make sure that a mixed reset is still disallowed in a bare repository. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/builtin-reset.c b/builtin-reset.c index 11d1c6e4d..3180c2b58 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -291,6 +291,10 @@ int cmd_reset(int argc, const char **argv, const char *prefix) die("%s reset requires a work tree", reset_type_names[reset_type]); + if (reset_type == MIXED && is_bare_repository()) + die("%s reset is not allowed in a bare repository", + reset_type_names[reset_type]); + /* 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. */