mergetools/meld: Use '--output' when available

diff --git a/builtin/commit.c b/builtin/commit.c
index e1af9b19f0be71484ae9341762dc2bf89cabb70c..cb738574f729e91ff239f12db3f3f1ef1ef9570c 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];