X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-reset.c;h=10dba60c39d3cf7dafe6d733a4d53977c285a73c;hb=7ee906694c28ab7281492d5114d2afabd964bd41;hp=713c2d5346e8dc7e502beffc256bfdcad9da6ad5;hpb=cfa97ae141160486dbe8a786487bcaa965a160f0;p=git.git

diff --git a/builtin-reset.c b/builtin-reset.c
index 713c2d534..10dba60c3 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. */