diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2011-12-06 18:43:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-06 15:13:39 -0800 |
| commit | 6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b (patch) | |
| tree | 276dfba73bd613d45c703e33ccffdc09cad7524d /t/t0090-cache-tree.sh | |
| parent | 11c8a74a64a49f236d475514f723123a8928463d (diff) | |
| download | git-6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b.tar.gz | |
reset: update cache-tree data when appropriate
In the case of --mixed and --hard, we throw away the old index and
rebuild everything from the tree argument (or HEAD). So we have an
opportunity here to fill in the cache-tree data, just as read-tree
did.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0090-cache-tree.sh')
| -rwxr-xr-x | t/t0090-cache-tree.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh index a3527a5c99..f97256292e 100755 --- a/t/t0090-cache-tree.sh +++ b/t/t0090-cache-tree.sh @@ -75,13 +75,13 @@ test_expect_success 'second commit has cache-tree' ' test_shallow_cache_tree ' -test_expect_failure 'reset --hard gives cache-tree' ' +test_expect_success 'reset --hard gives cache-tree' ' test-scrap-cache-tree && git reset --hard && test_shallow_cache_tree ' -test_expect_failure 'reset --hard without index gives cache-tree' ' +test_expect_success 'reset --hard without index gives cache-tree' ' rm -f .git/index && git reset --hard && test_shallow_cache_tree |