diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 13:01:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 13:01:19 -0800 |
| commit | f0b0d78489407f9b934cc0d4ae83e078553acbcd (patch) | |
| tree | 46e521b9f27928a33fa4646e4adaf2107c2a25bc /t | |
| parent | 6329bade6632a9df4b37dd3a7f8d641eed74bbf5 (diff) | |
| parent | 35eabd1579726d594e84fc8328a5c87693dd065a (diff) | |
| download | git-f0b0d78489407f9b934cc0d4ae83e078553acbcd.tar.gz git-f0b0d78489407f9b934cc0d4ae83e078553acbcd.tar.xz | |
Merge branch 'maint-1.6.5' into maint
* maint-1.6.5:
Git 1.6.5.8
Fix mis-backport of t7002
bash completion: factor submodules into dirty state
reset: unbreak hard resets with GIT_WORK_TREE
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7103-reset-bare.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh index 68041df5f..afb55b3a4 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 |