Nguyễn Thái Ngọc DuyI use git to manages patches in my Gentoo development. In Gentoo, all ebuilds (another form of RPM spec) corresponding to different versions of the same package are grouped into one directory. So patches for each versions usually have a prefix to separate them from the ones for other versions. With --prefix it comes handy to produce such patches, for example:
git format-patch --prefix dbus-1.2.3- HEAD~5
will generate patches for dbus-1.2.3 for me, all starting with "dbus-1.2.3-".
This might be handy for RPM developers as well.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- This reminds me of another handy patch: git init --import. Any chance that patch could get in too?
Documentation/git-format-patch.txt | 6 ++- builtin-log.c | 9 ++- log-tree.c | 10 ++- log-tree.h | 4 +- revision.h | 1 + t/t4013-diff-various.sh | 1 + ...h_--attach_--stdout_--prefix=foo-_initial..side | 61 ++++++++++++++++++++ 7 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 t/t4013/diff.format-patch_--attach_--stdout_--prefix=foo-_initial..side
Show changes to 7 files +80 −9
Documentation/git-format-patch.txt, builtin-log.c, log-tree.c, log-tree.h, revision.h, t/t4013-diff-various.sh, t/t4013/diff.format-patch_--attach_--stdout_--prefix=foo-_initial..side
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 6f1fc80..7423d67 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -15,7 +15,8 @@ SYNOPSIS [-s | --signoff] [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files] - [--in-reply-to=Message-Id] [--suffix=.<sfx>] + [--in-reply-to=Message-Id] + [--prefix=<pfx>] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--subject-prefix=Subject-Prefix] [--cc=<email>] @@ -168,6 +169,9 @@ if that is not set. containing the shortlog and the overall diffstat. You can fill in a description in the file before sending it out. +--prefix=.<pfx>:: + Prepend specified prefix in front of generated filenames. + --suffix=.<sfx>:: Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is diff --git a/builtin-log.c b/builtin-log.c index 0d34050..dafa628 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -419,6 +419,7 @@ int cmd_log(int argc, const char **argv, const char *prefix) /* format-patch */ +static const char *fmt_patch_prefix = ""; static const char *fmt_patch_suffix = ".patch"; static int numbered = 0; static int auto_number = 1; @@ -524,18 +525,19 @@ static int outdir_offset; static int reopen_stdout(struct commit *commit, struct rev_info *rev) { struct strbuf filename = STRBUF_INIT; + int prefix_len = strlen(fmt_patch_prefix); int suffix_len = strlen(fmt_patch_suffix) + 1; if (output_directory) { strbuf_addstr(&filename, output_directory); if (filename.len >= - PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len) + PATH_MAX - FORMAT_PATCH_NAME_MAX - prefix_len - suffix_len) return error("name of output directory is too long"); if (filename.buf[filename.len - 1] != '/') strbuf_addch(&filename, '/'); } - get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename); + get_patch_filename(commit, rev->nr, fmt_patch_prefix, fmt_patch_suffix, &filename); if (!DIFF_OPT_TST(&rev->diffopt, QUIET)) fprintf(realstdout, "%s\n", filename.buf + outdir_offset); @@ -877,6 +879,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) "generate a cover letter"), OPT_BOOLEAN(0, "numbered-files", &numbered_files, "use simple number sequence for output file names"), + OPT_STRING(0, "prefix", &fmt_patch_prefix, "pfx", + "prepend <pfx> to output file names"), OPT_STRING(0, "suffix", &fmt_patch_suffix, "sfx", "use <sfx> instead of '.patch'"), OPT_INTEGER(0, "start-number", &start_number, @@ -1093,6 +1097,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) string_list_append(msgid, rev.ref_message_ids); } rev.numbered_files = numbered_files; + rev.patch_prefix = fmt_patch_prefix; rev.patch_suffix = fmt_patch_suffix; if (cover_letter) { if (thread) diff --git a/log-tree.c b/log-tree.c index 59d63eb..139c8b5 100644 --- a/log-tree.c +++ b/log-tree.c @@ -180,12 +180,13 @@ static int has_non_ascii(const char *s) return 0; } -void get_patch_filename(struct commit *commit, int nr, const char *suffix, - struct strbuf *buf) +void get_patch_filename(struct commit *commit, int nr, const char *prefix, + const char *suffix, struct strbuf *buf) { int suffix_len = strlen(suffix) + 1; - int start_len = buf->len; + int start_len = buf->len + strlen(prefix); + strbuf_addstr(buf, prefix); strbuf_addf(buf, commit ? "%04d-" : "%d", nr); if (commit) { int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; @@ -263,7 +264,8 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, extra_headers = subject_buffer; get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr, - opt->patch_suffix, &filename); + opt->patch_prefix, opt->patch_suffix, + &filename); snprintf(buffer, sizeof(buffer) - 1, "\n--%s%s\n" "Content-Type: text/x-patch;" diff --git a/log-tree.h b/log-tree.h index 20b5caf..566c85d 100644 --- a/log-tree.h +++ b/log-tree.h @@ -20,7 +20,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, void load_ref_decorations(void); #define FORMAT_PATCH_NAME_MAX 64 -void get_patch_filename(struct commit *commit, int nr, const char *suffix, - struct strbuf *buf); +void get_patch_filename(struct commit *commit, int nr, const char *prefix, + const char *suffix, struct strbuf *buf); #endif diff --git a/revision.h b/revision.h index 227164c..b35c038 100644 --- a/revision.h +++ b/revision.h @@ -85,6 +85,7 @@ struct rev_info { struct log_info *loginfo; int nr, total; const char *mime_boundary; + const char *patch_prefix; const char *patch_suffix; int numbered_files; char *message_id; diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 8b33321..771b849 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -246,6 +246,7 @@ format-patch --stdout initial..master format-patch --stdout --no-numbered initial..master format-patch --stdout --numbered initial..master format-patch --attach --stdout initial..side +format-patch --attach --stdout --prefix=foo- initial..side format-patch --attach --stdout --suffix=.diff initial..side format-patch --attach --stdout initial..master^ format-patch --attach --stdout initial..master diff --git a/t/t4013/diff.format-patch_--attach_--stdout_--prefix=foo-_initial..side b/t/t4013/diff.format-patch_--attach_--stdout_--prefix=foo-_initial..side new file mode 100644 index 0000000..a5a78d8 --- /dev/null +++ b/t/t4013/diff.format-patch_--attach_--stdout_--prefix=foo-_initial..side @@ -0,0 +1,61 @@ +$ git format-patch --attach --stdout --prefix=foo- initial..side +From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 +From: A U Thor <author@example.com> +Date: Mon, 26 Jun 2006 00:03:00 +0000 +Subject: [PATCH] Side +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" + +This is a multi-part message in MIME format. +--------------g-i-t--v-e-r-s-i-o-n +Content-Type: text/plain; charset=UTF-8; format=fixed +Content-Transfer-Encoding: 8bit + +--- + dir/sub | 2 ++ + file0 | 3 +++ + file3 | 4 ++++ + 3 files changed, 9 insertions(+), 0 deletions(-) + create mode 100644 file3 + + +--------------g-i-t--v-e-r-s-i-o-n +Content-Type: text/x-patch; name="foo-0001-Side.patch" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; filename="foo-0001-Side.patch" + +diff --git a/dir/sub b/dir/sub +index 35d242b..7289e35 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++1 ++2 +diff --git a/file0 b/file0 +index 01e79c3..f4615da 100644 +--- a/file0 ++++ b/file0 +@@ -1,3 +1,6 @@ + 1 + 2 + 3 ++A ++B ++C +diff --git a/file3 b/file3 +new file mode 100644 +index 0000000..7289e35 +--- /dev/null ++++ b/file3 +@@ -0,0 +1,4 @@ ++A ++B ++1 ++2 + +--------------g-i-t--v-e-r-s-i-o-n-- + + +$
-- 1.6.3.2.318.g2fd57
