merge: allow reading the merge commit message from a file

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index c9c2f0e10264a365eaead2beadd07e3e1a36bd8b..20ae9191ca376841ca2540502d85a3dc150d3417 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -55,7 +55,7 @@ static char *get_default_remote(void)
 
 static int print_default_remote(int argc, const char **argv, const char *prefix)
 {
-       const char *remote;
+       char *remote;
 
        if (argc != 1)
                die(_("submodule--helper print-default-remote takes no arguments"));
@@ -64,6 +64,7 @@ static int print_default_remote(int argc, const char **argv, const char *prefix)
        if (remote)
                printf("%s\n", remote);
 
+       free(remote);
        return 0;
 }