diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 5 | ||||
| -rw-r--r-- | builtin/ls-files.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index cb738574f7..50bacd68e2 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -257,8 +257,9 @@ static int list_paths(struct string_list *list, const char *with_tree, m = xcalloc(1, i); if (with_tree) { - const char *max_prefix = pathspec_prefix(prefix, pattern); - overlay_tree_on_cache(with_tree, max_prefix); + char *max_prefix = pathspec_prefix(pattern); + overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix); + free(max_prefix); } for (i = 0; i < active_nr; i++) { diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 0e98bff0c4..19e53cc881 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -541,7 +541,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) strip_trailing_slash_from_submodules(); /* Find common prefix for all pathspec's */ - max_prefix = pathspec_prefix(prefix, pathspec); + max_prefix = pathspec_prefix(pathspec); max_prefix_len = max_prefix ? strlen(max_prefix) : 0; /* Treat unmatching pathspec elements as errors */ |