commit: allow partial commits with relative paths

bmwill · gitster · commit 86238e07ef63 · 2018-04-05T17:05:48.000+09:00
Commit 8894d53 (commit: allow partial commits with relative paths, 2011-07-30) ensured that partial commits were allowed when a user supplies a relative pathspec but then this was regressed in 5879f56 (remove prefix argument from pathspec_prefix, 2011-09-04) when the prefix argument to 'pathspec_prefix' removed and the 'list_paths' function wasn't properly adjusted to cope with the change, resulting in over-eager pruning of the tree that is overlayed on the index. This fixes the regression and adds a regression test so this can be prevented in the future. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -253,8 +253,7 @@ static int list_paths(struct string_list *list, const char *with_tree,
 
 	if (with_tree) {
 		char *max_prefix = common_prefix(pattern);
-		overlay_tree_on_index(&the_index, with_tree,
-				      max_prefix ? max_prefix : prefix);
+		overlay_tree_on_index(&the_index, with_tree, max_prefix);
 		free(max_prefix);
 	}
 
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
@@ -52,6 +52,18 @@ test_expect_success PERL 'can use paths with --interactive' '
 	git reset --hard HEAD^
 '
 
+test_expect_success 'removed files and relative paths' '
+	test_when_finished "rm -rf foo" &&
+	git init foo &&
+	>foo/foo.txt &&
+	git -C foo add foo.txt &&
+	git -C foo commit -m first &&
+	git -C foo rm foo.txt &&
+
+	mkdir -p foo/bar &&
+	git -C foo/bar commit -m second ../foo.txt
+'
+
 test_expect_success 'using invalid commit with -C' '
 	test_must_fail git commit --allow-empty -C bogus
 '

Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,7 @@ static int list_paths(struct string_list list, const char with_tree,`
`253`	`253`
`254`	`254`	`if (with_tree) {`
`255`	`255`	`char *max_prefix = common_prefix(pattern);`
`256`		`- overlay_tree_on_index(&the_index, with_tree,`
`257`		`- max_prefix ? max_prefix : prefix);`
	`256`	`+ overlay_tree_on_index(&the_index, with_tree, max_prefix);`
`258`	`257`	`free(max_prefix);`
`259`	`258`	`}`
`260`	`259`