X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-revert.c;h=c41788685bf0b5bea3a3ae26615795e07a995793;hb=d258b25887f763db96c20d4ec805ae685f55bdd1;hp=e9da870d22c14c32a0e0a6cb71b933c79a2d8b53;hpb=d1f2e1696ce168b3a70b59be7c58fa96c530d4fb;p=git.git diff --git a/builtin-revert.c b/builtin-revert.c index e9da870d2..c41788685 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -180,7 +180,7 @@ static void set_author_ident_env(const char *message) email++; timestamp = strchr(email, '>'); if (!timestamp) - die ("Could not extract author email from %s", + die ("Could not extract author time from %s", sha1_to_hex(commit->object.sha1)); *timestamp = '\0'; for (timestamp++; *timestamp && isspace(*timestamp); @@ -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"; @@ -426,6 +426,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) return execv_git_cmd(args); } free(reencoded_message); + free(defmsg); return 0; }