refactor duplicated encode_header in pack-objects and fast-import

diff --git a/builtin-revert.c b/builtin-revert.c
index ad612497a2aba1039ab19976a147738dec100a8a..eff52687a87b45b766e064eede7c2c35b6d133d2 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -208,14 +208,16 @@ static char *help_msg(const char *name)
 
        strbuf_addstr(&helpbuf, "  After resolving the conflicts,\n"
                "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
-               "and commit the result.");
+               "and commit the result");
 
        if (action == CHERRY_PICK) {
-               strbuf_addf(&helpbuf,
-                       "  When committing, use the option '-c %s'\n"
-                       "to retain authorship and message.",
+               strbuf_addf(&helpbuf, " with: \n"
+                       "\n"
+                       "        git commit -c %s\n",
                        name);
        }
+       else
+               strbuf_addch(&helpbuf, '.');
        return strbuf_detach(&helpbuf, NULL);
 }