Merge branch 'bw/commit-partial-from-subdirectory-fix'

gitster · gitster · commit 8295f2028f62 · 2018-04-25T13:28:53.000+09:00
"cd sub/dir &amp;&amp; git commit ../path" ought to record the changes to
the file "sub/path", but this regressed long time ago.

* bw/commit-partial-from-subdirectory-fix:
  commit: allow partial commits with relative paths
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -218,8 +218,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
`@@ -218,8 +218,7 @@ static int list_paths(struct string_list list, const char with_tree,`
`218`	`218`
`219`	`219`	`if (with_tree) {`
`220`	`220`	`char *max_prefix = common_prefix(pattern);`
`221`		`- overlay_tree_on_index(&the_index, with_tree,`
`222`		`- max_prefix ? max_prefix : prefix);`
	`221`	`+ overlay_tree_on_index(&the_index, with_tree, max_prefix);`
`223`	`222`	`free(max_prefix);`
`224`	`223`	`}`
`225`	`224`