@matheusbsbs / matheus-bagliano / commits / abda522777
Fork 0

Use .git/MERGE_MSG in cherry-pick/revert

Rather than storing the temporary commit message data in .msg (in the working tree) we now store the message data in .git/MERGE_MSG. By storing the message in the .git/ directory we are sure we will never have a collision with a user file, should a project actually have a ".msg" file in their top level tree. We also don't need to worry about leaving this stale file behind during a `reset --hard` and have it show up in the output of status. We are using .git/MERGE_MSG here to store the temporary message as it is an already established convention between git-merge, git-am and git-rebase that git-commit will default the user's edit buffer to the contents of .git/MERGE_MSG. If the user is going to need to resolve this commit or wants to edit the message on their own prepping that file with the desired message "just works". Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn O. Pearce committed May 7, 2007 at 22:57 UTC abda5227770b39bb4abd8f0b4c1a0f69c2778300
1 file changed +6 -11
builtin-revert.c
+6 -11
@@ -237,6 +237,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
237 int i;
238 char *oneline, *reencoded_message = NULL;
239 const char *message, *encoding;
240 + const char *defmsg = xstrdup(git_path("MERGE_MSG"));
241
242 git_config(git_default_config);
243 me = action == REVERT ? "revert" : "cherry-pick";
@@ -280,7 +281,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
281 * reverse of it if we are revert.
282 */
283
283 - msg_fd = hold_lock_file_for_update(&msg_file, ".msg", 1);
284 + msg_fd = hold_lock_file_for_update(&msg_file, defmsg, 1);
285
286 encoding = get_encoding(message);
287 if (!encoding)
@@ -330,7 +331,6 @@ static int revert_or_cherry_pick(int argc, const char **argv)
331 sha1_to_hex(head), "HEAD",
332 sha1_to_hex(next->object.sha1), oneline) ||
333 write_tree(head, 0, NULL)) {
333 - const char *target = git_path("MERGE_MSG");
334 add_to_msg("\nConflicts:\n\n");
335 read_cache();
336 for (i = 0; i < active_nr;) {
@@ -345,10 +345,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
345 }
346 }
347 if (close(msg_fd) || commit_lock_file(&msg_file) < 0)
348 - die ("Error wrapping up .msg");
349 - unlink(target);
350 - if (rename(".msg", target))
351 - die ("Could not move .msg to %s", target);
348 + die ("Error wrapping up %s", defmsg);
349 fprintf(stderr, "Automatic %s failed. "
350 "After resolving the conflicts,\n"
351 "mark the corrected paths with 'git-add <paths>'\n"
@@ -362,7 +359,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
359 exit(1);
360 }
361 if (close(msg_fd) || commit_lock_file(&msg_file) < 0)
365 - die ("Error wrapping up .msg");
362 + die ("Error wrapping up %s", defmsg);
363 fprintf(stderr, "Finished one %s.\n", me);
364
365 /*
@@ -376,11 +373,9 @@ static int revert_or_cherry_pick(int argc, const char **argv)
373
374 if (!no_commit) {
375 if (edit)
379 - return execl_git_cmd("commit", "-n", "-F", ".msg",
380 - "-e", NULL);
376 + return execl_git_cmd("commit", "-n", NULL);
377 else
382 - return execl_git_cmd("commit", "-n", "-F", ".msg",
383 - NULL);
378 + return execl_git_cmd("commit", "-n", "-F", defmsg, NULL);
379 }
380 if (reencoded_message)
381 free(reencoded_message);