Merge branch 'jk/maint-ls-files-other' into maint

[git.git] / builtin-revert.c

diff --git a/builtin-revert.c b/builtin-revert.c
index e839387629461be24c0bf1dacaa3cdb48cb2a5f4..786a956f26486856c97e15ce8ab464dfb25dcbc5 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -269,7 +269,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
        int i;
        char *oneline, *reencoded_message = NULL;
        const char *message, *encoding;
-       const char *defmsg = xstrdup(git_path("MERGE_MSG"));
+       char *defmsg = xstrdup(git_path("MERGE_MSG"));
 
        git_config(git_default_config, NULL);
        me = action == REVERT ? "revert" : "cherry-pick";
@@ -427,6 +427,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
                return execv_git_cmd(args);
        }
        free(reencoded_message);
+       free(defmsg);
 
        return 0;
 }