diff options
author | Jeff King <peff@peff.net> | 2007-12-31 10:13:52 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-01-02 13:28:54 +0300 |
commit | 49b9362fd35d45dc94ea15006c4bb88671b8da7d (patch) | |
tree | 10255163d7bcb8881d8fdd30f54caa22bf99b78c | |
parent | 02e5ba4ae63729c28704280f1b8cfcb205c06960 (diff) |
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>
-rw-r--r-- | builtin-reset.c | 3 | ||||
-rwxr-xr-x | t/t7103-reset-bare.sh | 28 |
2 files changed, 31 insertions, 0 deletions
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. */ diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh new file mode 100755 index 0000000000..b25a77f910 --- /dev/null +++ b/t/t7103-reset-bare.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +test_description='git-reset in a bare repository' +. ./test-lib.sh + +test_expect_success 'setup non-bare' ' + echo one >file && + git add file && + git commit -m one && + echo two >file && + git commit -a -m two +' + +test_expect_success 'setup bare' ' + git clone --bare . bare.git && + cd bare.git +' + +test_expect_success 'hard reset is not allowed' ' + ! git reset --hard HEAD^ +' + +test_expect_success 'soft reset is allowed' ' + git reset --soft HEAD^ && + test "`git show --pretty=format:%s | head -n 1`" = "one" +' + +test_done |