summaryrefslogtreecommitdiff
path: root/t/t7103-reset-bare.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-10 16:52:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-10 16:52:53 (GMT)
commit0b4ae29f0328fb8c270030abad132e8f50e05381 (patch)
tree7c95d5b74f47a5c98a35ede8498d4bdbc8b6ff02 /t/t7103-reset-bare.sh
parent84d52cabe7044786b5cc448ffeb97b7c1e667156 (diff)
parentcd0f0f68e1074e684a014e1714104693097caabc (diff)
downloadgit-0b4ae29f0328fb8c270030abad132e8f50e05381.zip
git-0b4ae29f0328fb8c270030abad132e8f50e05381.tar.gz
git-0b4ae29f0328fb8c270030abad132e8f50e05381.tar.bz2
Merge branch 'jk/maint-1.6.5-reset-hard'
* jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE
Diffstat (limited to 't/t7103-reset-bare.sh')
-rwxr-xr-xt/t7103-reset-bare.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index 68041df..afb55b3 100755
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -29,6 +29,12 @@ 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