checkout: tone down the "forked status" diagnostic messages

diff --git a/builtin-revert.c b/builtin-revert.c
index 4f86178bbd4917c6b36eb9c80aeee5bd588edbc0..358af537476b0b558989f27fe60627af6977635b 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -234,7 +234,7 @@ static char *help_msg(const unsigned char *sha1)
 
        strcpy(helpbuf, "  After resolving the conflicts,\n"
               "mark the corrected paths with 'git add <paths>' "
-              "and commit the result.");
+              "or 'git rm <paths>' and commit the result.");
 
        if (action == CHERRY_PICK) {
                sprintf(helpbuf + strlen(helpbuf),
@@ -371,13 +371,13 @@ static int revert_or_cherry_pick(int argc, const char **argv)
                                        i++;
                        }
                }
-               if (close(msg_fd) || commit_lock_file(&msg_file) < 0)
+               if (commit_lock_file(&msg_file) < 0)
                        die ("Error wrapping up %s", defmsg);
                fprintf(stderr, "Automatic %s failed.%s\n",
                        me, help_msg(commit->object.sha1));
                exit(1);
        }
-       if (close(msg_fd) || commit_lock_file(&msg_file) < 0)
+       if (commit_lock_file(&msg_file) < 0)
                die ("Error wrapping up %s", defmsg);
        fprintf(stderr, "Finished one %s.\n", me);