diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:17 -0700 |
| commit | ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4 (patch) | |
| tree | 95b3ad81be30f2d56be61e1a68c06ea6a450f93d /builtin/commit.c | |
| parent | Merge branch 'jn/maint-http-error-message' (diff) | |
| parent | rename pathspec_prefix() to common_prefix() and move to dir.[ch] (diff) | |
| download | tgif-ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4.tar.xz | |
Merge branch 'cb/common-prefix-unification'
* cb/common-prefix-unification:
rename pathspec_prefix() to common_prefix() and move to dir.[ch]
consolidate pathspec_prefix and common_prefix
remove prefix argument from pathspec_prefix
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index cbc9613ec6..b9ab5ef314 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -255,8 +255,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 = common_prefix(pattern); + overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix); + free(max_prefix); } for (i = 0; i < active_nr; i++) { |