summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2011-12-06 17:43:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-06 23:13:39 (GMT)
commit6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b (patch)
tree276dfba73bd613d45c703e33ccffdc09cad7524d /builtin/reset.c
parent11c8a74a64a49f236d475514f723123a8928463d (diff)
downloadgit-6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b.zip
git-6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b.tar.gz
git-6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b.tar.bz2
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 'builtin/reset.c')
-rw-r--r--builtin/reset.c7
1 files changed, 7 insertions, 0 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."));