summaryrefslogtreecommitdiff
path: root/builtin-reset.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-12-31 07:13:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-02 10:28:54 (GMT)
commit49b9362fd35d45dc94ea15006c4bb88671b8da7d (patch)
tree10255163d7bcb8881d8fdd30f54caa22bf99b78c /builtin-reset.c
parent02e5ba4ae63729c28704280f1b8cfcb205c06960 (diff)
downloadgit-49b9362fd35d45dc94ea15006c4bb88671b8da7d.zip
git-49b9362fd35d45dc94ea15006c4bb88671b8da7d.tar.gz
git-49b9362fd35d45dc94ea15006c4bb88671b8da7d.tar.bz2
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-reset.c')
-rw-r--r--builtin-reset.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-reset.c b/builtin-reset.c
index 713c2d5..10dba60 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. */