diff --git a/builtin-reset.c b/builtin-reset.c
index 73e60223db844ee2445aff0b2253f0f21e8a5bef..e4418bced23807df174e600a4babbf1d604bac8e 100644 (file)
--- a/builtin-reset.c
+++ b/builtin-reset.c
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");
+ if (reset_type == HARD || reset_type == MERGE)
+ setup_work_tree();
/* Soft reset does not touch the index file nor the working tree
* at all, but requires them in a good order. Other resets reset