strbuf.c: remove unused function

diff --git a/builtin-reset.c b/builtin-reset.c
index 25b38cee187f2d7473d25bbc462d4d30ec7266f2..5b647422d6d23c31ce568ea9ba3bf69eb39cec44 100644 (file)
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -285,8 +285,8 @@ 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");
+       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