From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:47:53 +0200 Subject: Adding upstream version 1:2.39.2. Signed-off-by: Daniel Baumann --- t/t7103-reset-bare.sh | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 t/t7103-reset-bare.sh (limited to 't/t7103-reset-bare.sh') diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh new file mode 100755 index 0000000..a60153f --- /dev/null +++ b/t/t7103-reset-bare.sh @@ -0,0 +1,74 @@ +#!/bin/sh + +test_description='git reset in a bare repository' + +TEST_PASSES_SANITIZE_LEAK=true +. ./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 '"hard" reset requires a worktree' ' + (cd .git && + test_must_fail git reset --hard) +' + +test_expect_success '"merge" reset requires a worktree' ' + (cd .git && + test_must_fail git reset --merge) +' + +test_expect_success '"keep" reset requires a worktree' ' + (cd .git && + test_must_fail git reset --keep) +' + +test_expect_success '"mixed" reset is ok' ' + (cd .git && git reset) +' + +test_expect_success '"soft" reset is ok' ' + (cd .git && git reset --soft) +' + +test_expect_success 'hard reset works with GIT_WORK_TREE' ' + mkdir worktree && + GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard && + test_cmp file worktree/file +' + +test_expect_success 'setup bare' ' + git clone --bare . bare.git && + cd bare.git +' + +test_expect_success '"hard" reset is not allowed in bare' ' + test_must_fail git reset --hard HEAD^ +' + +test_expect_success '"merge" reset is not allowed in bare' ' + test_must_fail git reset --merge HEAD^ +' + +test_expect_success '"keep" reset is not allowed in bare' ' + test_must_fail git reset --keep HEAD^ +' + +test_expect_success '"mixed" reset is not allowed in bare' ' + test_must_fail git reset --mixed HEAD^ +' + +test_expect_success !SANITIZE_LEAK '"soft" reset is allowed in bare' ' + git reset --soft HEAD^ && + git show --pretty=format:%s >out && + echo one >expect && + head -n 1 out >actual && + test_cmp expect actual +' + +test_done -- cgit v1.2.3