format-patch: add --reroll-count=$N option

diff --git a/log-tree.c b/log-tree.c
index 670beaebf9b6aaacd3b50c92ff2f1ee8e1c84759..5dc126b65c744b09bdde3a496c47c7ba2faeab8d 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -308,6 +308,8 @@ void fmt_output_subject(struct strbuf *filename,
        int start_len = filename->len;
        int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
 
+       if (0 < info->reroll_count)
+               strbuf_addf(filename, "v%d-", info->reroll_count);
        strbuf_addf(filename, "%04d-%s", nr, subject);
 
        if (max_len < filename->len)