From 49b9362fd35d45dc94ea15006c4bb88671b8da7d Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 31 Dec 2007 02:13:52 -0500 Subject: git-reset: refuse to do hard reset in a bare repository It makes no sense since there is no working tree. A soft reset should be fine, though. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin-reset.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'builtin-reset.c') diff --git a/builtin-reset.c b/builtin-reset.c index 713c2d5346..10dba60c39 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -244,6 +244,9 @@ int cmd_reset(int argc, const char **argv, const char *prefix) if (reset_type == NONE) reset_type = MIXED; /* by default */ + if (reset_type == HARD && is_bare_repository()) + die("hard reset makes no sense in a bare repository"); + /* 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. */ -- cgit v1.2.1