Merge branch 'jc/parseopt-expiry-errors'

diff --git a/builtin/commit.c b/builtin/commit.c
index 37fcb55ab0a03a5fdabaca1913bc700201fd8e10..5571d4a3e2be5ee8a71b7d5dba72b782c848f15e 100644 (file)
--- 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);
        }