[PATCH 5/5] reset: update cache-tree data when appropriate
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Dec 6, 2011, 17:43 UTC
- Message-ID
- <1385c10084ae41ae4543ef3ccaa1d6c8182b2204.1323191497.git.trast@student.ethz.ch>
- In-Reply-To
- <cover.1323191497.git.trast@student.ethz.ch>
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> --- builtin/reset.c | 7 +++++++ t/t0090-cache-tree.sh | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin/reset.c b/builtin/reset.c index 811e8e2..8c2c1d5 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -43,6 +43,7 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet int nr = 1; int newfd; struct tree_desc desc[2]; + struct tree *tree; struct unpack_trees_options opts; struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); @@ -84,6 +85,12 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet return error(_("Failed to find tree of %s."), sha1_to_hex(sha1)); if (unpack_trees(nr, desc, &opts)) return -1; + + if (reset_type == MIXED || reset_type == HARD) { + tree = parse_tree_indirect(sha1); + prime_cache_tree(&active_cache_tree, tree); + } + if (write_cache(newfd, active_cache, active_nr) || commit_locked_index(lock)) return error(_("Could not write new index file.")); diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh index a3527a5..f972562 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
-- 1.7.8.425.ga639d3