Merge branch 'jn/maint-test-return'

diff --git a/builtin/commit.c b/builtin/commit.c
index 9679a99f9902583094ddc1e31d44d119203482a9..776fa81f7484e2bc54651006097f52e0e0f740a8 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -256,8 +256,10 @@ static int list_paths(struct string_list *list, const char *with_tree,
                ;
        m = xcalloc(1, i);
 
-       if (with_tree)
-               overlay_tree_on_cache(with_tree, prefix);
+       if (with_tree) {
+               const char *max_prefix = pathspec_prefix(prefix, pattern);
+               overlay_tree_on_cache(with_tree, max_prefix);
+       }
 
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];