@matheusbsbs / matheus-bagliano / commits / b8c74690b2

revert: improve error message for cherry-pick during cherry-pick

In the spirit of v1.6.3.3~3^2 (refuse to merge during a merge, 2009-07-01), "git cherry-pick" refuses to start a new cherry-pick when in the middle of an existing conflicted cherry-pick in the following sequence: 1. git cherry-pick HEAD..origin 2. resolve conflicts 3. git cherry-pick HEAD..origin (instead of "git cherry-pick --continue", by mistake) Good. However, the error message on attempting step 3 is more convoluted than necessary: $ git cherry-pick HEAD..origin error: .git/sequencer already exists. error: A cherry-pick or revert is in progress. hint: Use --continue to continue the operation hint: or --quit to forget about it fatal: cherry-pick failed Clarify by removing the redundant first "error:" message, simplifying the advice, and using lower-case and no full stops to be consistent with other commands that prefix their messages with "error:", so it becomes error: a cherry-pick or revert is already in progress hint: try "git cherry-pick (--continue | --quit)" fatal: cherry-pick failed The "fatal: cherry-pick failed" line seems unnecessary, too, but that can be fixed some other day. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Nov 22, 2011 at 05:15 UTC b8c74690b20b7c4dd405f71d63bab325447356da
1 file changed +6 -7
builtin/revert.c
+6 -7
@@ -846,8 +846,11 @@ static int create_seq_dir(void)
846 {
847 const char *seq_dir = git_path(SEQ_DIR);
848
849 - if (file_exists(seq_dir))
850 - return error(_("%s already exists."), seq_dir);
849 + if (file_exists(seq_dir)) {
850 + error(_("a cherry-pick or revert is already in progress"));
851 + advise(_("try \"git cherry-pick (--continue | --quit)\""));
852 + return -1;
853 + }
854 else if (mkdir(seq_dir, 0777) < 0)
855 die_errno(_("Could not create sequencer directory %s"), seq_dir);
856 return 0;
@@ -991,12 +994,8 @@ static int pick_revisions(struct replay_opts *opts)
994 */
995
996 walk_revs_populate_todo(&todo_list, opts);
994 - if (create_seq_dir() < 0) {
995 - error(_("A cherry-pick or revert is in progress."));
996 - advise(_("Use --continue to continue the operation"));
997 - advise(_("or --quit to forget about it"));
997 + if (create_seq_dir() < 0)
998 return -1;
999 - }
999 if (get_sha1("HEAD", sha1)) {
1000 if (opts->action == REVERT)
1001 return error(_("Can't revert as initial commit"));