Merge branch 'jk/complete-checkout-sans-dwim-remote'

diff --git a/builtin/commit.c b/builtin/commit.c
index ad188fea9ec552c65c4b82c3558977dd6648fe77..1d805f5da8abd1cfafc41c5c47fd048b2549fbf4 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -821,9 +821,9 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                                        "If this is not correct, please remove the file\n"
                                        "       %s\n"
                                        "and try again.\n"),
-                               git_path(whence == FROM_MERGE
-                                        ? "MERGE_HEAD"
-                                        : "CHERRY_PICK_HEAD"));
+                               whence == FROM_MERGE ?
+                                       git_path_merge_head() :
+                                       git_path_cherry_pick_head());
                }
 
                fprintf(s->fp, "\n");