git/t/t4014-format-patch.sh, branch v1.7.2

format-patch: Add a signature option (--signature)

2010-06-16T17:08:59Z

By default, git uses the version string as the signature for all patches output by format-patch. Many employers (mine included) require the use of a signature on all outgoing mails. In a format-patch | send-email workflow there isn't an easy way to modify the signature without breaking the pipe and manually replacing the version string with the signature required. Instead of doing all that work, add an option (--signature) and a config variable (format.signature) to replace the default git version signature when formatting patches. This does modify the original behavior of format-patch a bit. First off the version string is now placed in the cover letter by default. Secondly, once the configuration variable format.signature is added to the .config file there is no way to revert back to the default git version signature. Instead, specifying the --no-signature option will remove the signature from the patches entirely. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-03-30T04:29:24Z

* maint: format-patch: Squelch 'fatal: Not a range." error

format-patch: Squelch 'fatal: Not a range." error

2010-03-30T04:22:37Z

Don't output an error on `git format-patch --ignore-if-in-upstream HEAD`. This matches the behavior of `git format-patch HEAD`. Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano

format-patch: add --no-cc, --no-to, and --no-add-headers

2010-03-08T23:55:41Z

These new options allow users to override their config settings for format.cc, format.to and format.headers respectively. These options only make git ignore the config settings and any previous command line options, so you'll still have to add more command line options to add extra headers. For example, $ cat .git/config [format] to = Someone $ git format-patch -1 --no-to --to="Someone Else " would format a patch addressed to "Someone Else" and not "Someone". Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Add 'git format-patch --to=' option and 'format.to' configuration variable.

2010-03-07T03:57:44Z

Has the same functionality as the '--cc' option and 'format.cc' configuration variable but for the "To:" email header. Half of the code to support this was already there. With email the To: header usually more important than the Cc: header. [jc: tests are by Stephen Boyd] Signed-off-by: Steven Drake Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

fix portability issues with $ in double quotes

2010-01-26T23:16:54Z

Using a dollar sign in double quotes isn't portable. Escape them with a backslash or replace the double quotes with single quotes. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Merge branch 'fc/maint-format-patch-pathspec-dashes'

2009-11-30T22:46:09Z

Conflicts: t/t4014-format-patch.sh

format-patch: add test for parsing of "--"

2009-11-27T05:23:55Z

Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

t4014-format-patch: do not assume 'test' is available as non-builtin

2009-11-23T10:55:59Z

One test case used 'xargs test', which assumes that 'test' is available as external program. At least on MinGW it is not. Moreover, 'git format-patch' was invoked in a pipeline, but not as the last command. Rewrite the test case to catch breakage in 'git format-patch' as well. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

format-patch: Always generate a patch

2009-11-10T19:37:47Z

Jeff King recently reinstated -p to suppress the default diffstat (as -p used to work before 68daa64, about 14 months ago). However, -p is also needed in combination with certain options (e.g. --stat or --numstat) in order to produce any patch at all. The documentation does not mention this. Since the purpose of format-patch is to produce a patch that can be emailed, it does not make sense that certain combination of options will suppress the generation of the patch itself. Therefore: * Update 'git format-patch' to always generate a patch. * Since the --name-only, --name-status, and --check suppresses the generation of the patch, disallow those options, and remove the description of them in the documentation. * Remove the reference to -p in the description of -U. * Remove the descriptions of the options that are synonyms for -p plus another option (--patch-with-raw and --patch-with-stat). * While at it, slightly tweak the description of -p itself to say that it generates "plain patches", so that you can think of -p as "plain patch" as an mnemonic aid. Signed-off-by: Björn Gustavsson Signed-off-by: Junio C Hamano