Enable setting attach as the default in .gitconfig for git-format-patch.
PATCH v2 1/1 Enable setting attach as the default in .gitconfig for git-format-patch.
Signed-off-by Jeremy White <[email protected]>
---
This v2 patch reflects a concern from Junio that you could not temporarily override the configuration setting.
Documentation/git-format-patch.txt | 11 +++++++++-- builtin-log.c | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-)
Documentation/git-format-patch.txt +9 -2
@@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git format-patch' [-k] [-o <dir> | --stdout] [--thread] - [--attach[=<boundary>] | --inline[=<boundary>]] + [--attach[=<boundary>] | --inline[=<boundary>] | + [--noattach]] [-s | --signoff] [<common diff options>] [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files]
@@ -117,6 +118,10 @@ include::diff-options.txt[] which is the commit message and the patch itself in the second part, with "Content-Disposition: attachment". +--noattach:: + Disable the creation of an attachment, overriding the + configuration setting. + --inline[=<boundary>]:: Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the
@@ -174,7 +179,8 @@ CONFIGURATION ------------- You can specify extra mail header lines to be added to each message in the repository configuration, new defaults for the subject prefix -and file suffix, and number patches when outputting more than one. +and file suffix, control attachements, and number patches when outputting +more than one. ------------ [format]
@@ -183,6 +189,7 @@ and file suffix, and number patches when outputting more than one. suffix = .txt numbered = auto cc = <email> + attach [ = mime-boundary-string ] ------------
builtin-log.c +19 -0
@@ -428,6 +428,8 @@ static const char *fmt_patch_suffix = ".patch";static int numbered =0 ;static int auto_number =1 ; +static char *default_attach =NULL ; +static char **extra_hdr;static int extra_hdr_nr;static int extra_hdr_alloc;
@@ -488,6 +490,14 @@ static int git_format_config(const char *var, const char *value, void *cb) auto_number = auto_number && numbered;return 0 ; } +if (!strcmp (var,"format.attach" )) { +if (value && *value) + default_attach =xstrdup (value); +else + default_attach =xstrdup (git_version_string); +return 0 ; + } +return git_log_config (var, value, cb); }
@@ -787,6 +797,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.subject_prefix = fmt_patch_subject_prefix; +if (default_attach) { + rev.mime_boundary = default_attach; + rev.no_inline =1 ; + } +/* * Parse the arguments before setup_revisions(), or something * like "git format-patch -o a123 HEAD^.." may fail; a123 is
@@ -849,6 +864,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.mime_boundary = argv[i] +9 ; rev.no_inline =1 ; } +else if (!strcmp (argv[i],"--noattach" )) { + rev.mime_boundary =NULL ; + rev.no_inline =0 ; + }else if (!strcmp (argv[i],"--inline" )) { rev.mime_boundary = git_version_string; rev.no_inline =0 ;
Signature · 1 line
1.6.2.rc0.57.g4ab7.dirty
Documentation/git-format-patch.txt SYNOPSIS · line 14
Quoted 11 lines · Jeremy White
Documentation/git-format-patch.txt +2
-1@@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git format-patch' [-k] [-o <dir> | --stdout] [--thread] - [--attach[=<boundary>] | --inline[=<boundary>]] + [--attach[=<boundary>] | --inline[=<boundary>] | + [--noattach]]
Hmph, don't we usually do this with --no-attach? Especially when format-patch starts using parse_options, I suspect that would be how the API gives negated options natively.
If there are no other issues people find in this patch, I'll amend it to use dash between no and attach and apply (hence no need to resend).
Thanks.