[PATCH v2 4/6] format-patch: move extra_headers logic later

[Denton Liu]

In a future patch, we need to perform the addition of To: and Cc:
to extra_headers after the branch_name logic. Simply transpose this
logic later in the function so that this happens. (This patch is best
viewed with `git diff --color-moved`.)

Note that this logic only depends on the `git_config` and
`repo_init_revisions` and is depended on by the patch creation logic
which is directly below it so this move is effectively a no-op as
no dependencies being reordered.

Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
 builtin/log.c | 58 +++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/builtin/log.c b/builtin/log.c
index 2bbe712e7c..f66a65fe84 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1680,35 +1680,6 @@ int cmd_format_patch(int argc, const char **argv, const 
char *prefix)
                rev.subject_prefix = strbuf_detach(&sprefix, NULL);
        }
 
-       for (i = 0; i < extra_hdr.nr; i++) {
-               strbuf_addstr(&buf, extra_hdr.items[i].string);
-               strbuf_addch(&buf, '\n');
-       }
-
-       if (extra_to.nr)
-               strbuf_addstr(&buf, "To: ");
-       for (i = 0; i < extra_to.nr; i++) {
-               if (i)
-                       strbuf_addstr(&buf, "    ");
-               strbuf_addstr(&buf, extra_to.items[i].string);
-               if (i + 1 < extra_to.nr)
-                       strbuf_addch(&buf, ',');
-               strbuf_addch(&buf, '\n');
-       }
-
-       if (extra_cc.nr)
-               strbuf_addstr(&buf, "Cc: ");
-       for (i = 0; i < extra_cc.nr; i++) {
-               if (i)
-                       strbuf_addstr(&buf, "    ");
-               strbuf_addstr(&buf, extra_cc.items[i].string);
-               if (i + 1 < extra_cc.nr)
-                       strbuf_addch(&buf, ',');
-               strbuf_addch(&buf, '\n');
-       }
-
-       rev.extra_headers = strbuf_detach(&buf, NULL);
-
        if (from) {
                if (split_ident_line(&rev.from_ident, from, strlen(from)))
                        die(_("invalid ident line: %s"), from);
@@ -1811,6 +1782,35 @@ int cmd_format_patch(int argc, const char **argv, const 
char *prefix)
                }
        }
 
+       for (i = 0; i < extra_hdr.nr; i++) {
+               strbuf_addstr(&buf, extra_hdr.items[i].string);
+               strbuf_addch(&buf, '\n');
+       }
+
+       if (extra_to.nr)
+               strbuf_addstr(&buf, "To: ");
+       for (i = 0; i < extra_to.nr; i++) {
+               if (i)
+                       strbuf_addstr(&buf, "    ");
+               strbuf_addstr(&buf, extra_to.items[i].string);
+               if (i + 1 < extra_to.nr)
+                       strbuf_addch(&buf, ',');
+               strbuf_addch(&buf, '\n');
+       }
+
+       if (extra_cc.nr)
+               strbuf_addstr(&buf, "Cc: ");
+       for (i = 0; i < extra_cc.nr; i++) {
+               if (i)
+                       strbuf_addstr(&buf, "    ");
+               strbuf_addstr(&buf, extra_cc.items[i].string);
+               if (i + 1 < extra_cc.nr)
+                       strbuf_addch(&buf, ',');
+               strbuf_addch(&buf, '\n');
+       }
+
+       rev.extra_headers = strbuf_detach(&buf, NULL);
+
        /*
         * We cannot move this anywhere earlier because we do want to
         * know if --root was given explicitly from the command line.
-- 
2.21.0.1049.geb646f7864