diff --git a/builtin-revert.c b/builtin-revert.c
index 27881e94937dd79b9a0524eb2d9770427ec4f4fb..74845ef8e6f9c635bbafbf5dfea5e73cf6e11aa0 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
int i;
char *oneline, *reencoded_message = NULL;
const char *message, *encoding;
- const char *defmsg = xstrdup(git_path("MERGE_MSG"));
+ char *defmsg = git_pathdup("MERGE_MSG");
git_config(git_default_config, NULL);
me = action == REVERT ? "revert" : "cherry-pick";
* reverse of it if we are revert.
*/
- msg_fd = hold_lock_file_for_update(&msg_file, defmsg, 1);
+ msg_fd = hold_lock_file_for_update(&msg_file, defmsg,
+ LOCK_DIE_ON_ERROR);
encoding = get_encoding(message);
if (!encoding)
return execv_git_cmd(args);
}
free(reencoded_message);
+ free(defmsg);
return 0;
}