diff --git a/builtin/commit.c b/builtin/commit.c
index 66ffe31736933d1ad15fdeb7bb321f10fcab1dd3..8f2bebecf313a0e4b742f9327ec178c7e3547dd2 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
m = xcalloc(1, i);
if (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++) {
}
for (i = 0; i < active_nr; i++) {
}
unlink(git_path("CHERRY_PICK_HEAD"));
}
unlink(git_path("CHERRY_PICK_HEAD"));
+ unlink(git_path("REVERT_HEAD"));
unlink(git_path("MERGE_HEAD"));
unlink(git_path("MERGE_MSG"));
unlink(git_path("MERGE_MODE"));
unlink(git_path("MERGE_HEAD"));
unlink(git_path("MERGE_MSG"));
unlink(git_path("MERGE_MODE"));