diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-02 09:22:07 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-02 10:32:39 +0400 |
| commit | 4fddf5798d8a0eb112c60a05272a2d9407eafc8f (patch) | |
| tree | e42a21f3137d606e7c466bf16e8e78ef4403451b | |
| parent | 82ca50556471eadfc3212cb478161c3da5c4d02a (diff) | |
git-mv: invalidate the removed path properly in cache-tree
The command updated the cache without invalidating the cache
tree entries while removing an existing entry.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-mv.c | 1 | ||||
| -rwxr-xr-x | t/t7001-mv.sh | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/builtin-mv.c b/builtin-mv.c index ff882bec47..6b0ab8aa9f 100644 --- a/builtin-mv.c +++ b/builtin-mv.c @@ -278,6 +278,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) for (i = 0; i < deleted.nr; i++) { const char *path = deleted.items[i].path; remove_file_from_cache(path); + cache_tree_invalidate_path(active_cache_tree, path); } if (active_cache_changed) { diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index b7fcdb390c..23a1eff3bb 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -86,4 +86,23 @@ test_expect_success \ 'move into "."' \ 'git-mv path1/path2/ .' +test_expect_success "Michael Cassar's test case" ' + rm -fr .git papers partA && + git init-db && + mkdir -p papers/unsorted papers/all-papers partA && + echo a > papers/unsorted/Thesis.pdf && + echo b > partA/outline.txt && + echo c > papers/unsorted/_another && + git add papers partA && + T1=`git write-tree` && + + git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf && + + T=`git write-tree` && + git ls-tree -r $T | grep partA/outline.txt || { + git ls-tree -r $T + (exit 1) + } +' + test_done |