Nicolas Morey-ChaisemartinHi,
I'm starting to look into the cover-at-tip topic that I found in the leftover bits (http://www.spinics.net/lists/git/msg259573.html)
Here's a first draft of a patch that adds support for format-patch --cover-at-tip. It compiles and works in my nice and user firnedly test case. Just wanted to make sure I was going roughly in the right direction here.
I was wondering where is the right place to put a commit_is_cover_at_tip() as the test will be needed in other place as the feature is extended to git am/merge/pull.
Feel free to comment. I know the help is not clear at this point and there's still some work to do on option handling (add a config option, probably have --cover-at-tip imply --cover-letter, etc) and some testing :)
--- Documentation/git-format-patch.txt | 4 ++++ builtin/log.c | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 6cbe462a7..0ac9d4b71 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -228,6 +228,10 @@ feeding the result to `git send-email`. containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out. +--[no-]cover-letter-at-tip:: + Use the tip of the series as a cover letter if it is an empty commit. + If no cover-letter is to be sent, the tip is ignored. + --notes[=<ref>]:: Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line. diff --git a/builtin/log.c b/builtin/log.c index 6c1fa896a..a0e9e61a3 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -986,11 +986,11 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, struct commit *origin, int nr, struct commit **list, const char *branch_name, - int quiet) + int quiet, + struct commit *cover_at_tip_commit) { const char *committer; const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n"; - const char *msg; struct shortlog log; struct strbuf sb = STRBUF_INIT; int i; @@ -1021,14 +1021,18 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, if (!branch_name) branch_name = find_branch_name(rev); - msg = body; pp.fmt = CMIT_FMT_EMAIL; pp.date_mode.type = DATE_RFC2822; pp.rev = rev; pp.print_email_subject = 1; - pp_user_info(&pp, NULL, &sb, committer, encoding); - pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte); - pp_remainder(&pp, &msg, &sb, 0); + + if (!cover_at_tip_commit) { + pp_user_info(&pp, NULL, &sb, committer, encoding); + pp_title_line(&pp, &body, &sb, encoding, need_8bit_cte); + pp_remainder(&pp, &body, &sb, 0); + } else { + pretty_print_commit(&pp, cover_at_tip_commit, &sb); + } add_branch_description(&sb, branch_name); fprintf(rev->diffopt.file, "%s\n", sb.buf); @@ -1409,6 +1413,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) int just_numbers = 0; int ignore_if_in_upstream = 0; int cover_letter = -1; + int cover_at_tip = -1; + struct commit *cover_at_tip_commit = NULL; int boundary_count = 0; int no_binary_diff = 0; int zero_commit = 0; @@ -1437,6 +1443,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) N_("print patches to standard out")), OPT_BOOL(0, "cover-letter", &cover_letter, N_("generate a cover letter")), + OPT_BOOL(0, "cover-at-tip", &cover_at_tip, + N_("fill the cover letter with the tip of the branch")), OPT_BOOL(0, "numbered-files", &just_numbers, N_("use simple number sequence for output file names")), OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"), @@ -1698,6 +1706,21 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (ignore_if_in_upstream && has_commit_patch_id(commit, &ids)) continue; + if (!nr && cover_at_tip == 1 && !cover_at_tip_commit) { + /* Check that it is a candidate to be a cover at tip + * Meaning: + * - a single parent (merge commits are not eligible) + * - tree oid == parent->tree->oid (no diff to the tree) + */ + if (commit->parents && !commit->parents->next && + !oidcmp(&commit->tree->object.oid, + &commit->parents->item->tree->object.oid)) { + cover_at_tip_commit = commit; + continue; + } else { + cover_at_tip = 0; + } + } nr++; REALLOC_ARRAY(list, nr); list[nr - 1] = commit; @@ -1748,7 +1771,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (thread) gen_message_id(&rev, "cover"); make_cover_letter(&rev, use_stdout, - origin, nr, list, branch_name, quiet); + origin, nr, list, branch_name, quiet, + cover_at_tip_commit); print_bases(&bases, rev.diffopt.file); print_signature(rev.diffopt.file); total++;
-- 2.15.0.rc0.1.g69b4f6344.dirty
