undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reset: update cache-tree data when appropriate

Browse Source 
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>
This commit is contained in:
Thomas Rast 2011-12-06 18:43:39 +01:00 committed by Junio C Hamano
parent 11c8a74a64
commit 6c52ec8a9a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/reset.c
View File

@ -43,6 +43,7 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet
int nr = 1; int nr = 1;
int newfd; int newfd;
struct tree_desc desc[2]; struct tree_desc desc[2];
struct tree *tree;
struct unpack_trees_options opts; struct unpack_trees_options opts;
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); 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)); return error(_("Failed to find tree of %s."), sha1_to_hex(sha1));
if (unpack_trees(nr, desc, &opts)) if (unpack_trees(nr, desc, &opts))
return -1; 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) || if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(lock)) commit_locked_index(lock))
return error(_("Could not write new index file.")); return error(_("Could not write new index file."));

4
t/t0090-cache-tree.sh
View File

@ -75,13 +75,13 @@ test_expect_success 'second commit has cache-tree' '
test_shallow_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 && test-scrap-cache-tree &&
git reset --hard && git reset --hard &&
test_shallow_cache_tree 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 && rm -f .git/index &&
git reset --hard && git reset --hard &&
test_shallow_cache_tree test_shallow_cache_tree