git-mv: invalidate the removed path properly in cache-tree

Junio C Hamano · Junio C Hamano · commit 4fddf5798d8a · 2006-10-01T23:32:39.000-07:00
The command updated the cache without invalidating the cache
tree entries while removing an existing entry.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,7 @@ int cmd_mv(int argc, const char *argv, const char prefix)`
`278`	`278`	`for (i = 0; i < deleted.nr; i++) {`
`279`	`279`	`const char *path = deleted.items[i].path;`
`280`	`280`	`remove_file_from_cache(path);`
	`281`	`+ cache_tree_invalidate_path(active_cache_tree, path);`
`281`	`282`	`}`
`282`	`283`
`283`	`284`	`if (active_cache_changed) {`