git/t/t4014-format-patch.sh, branch v2.26.3

Merge branch 'dl/format-patch-notes-config-fixup'

2019-12-25T19:21:58Z

"git format-patch" can take a set of configured format.notes values to specify which notes refs to use in the log message part of the output. The behaviour of this was not consistent with multiple --notes command line options, which has been corrected. * dl/format-patch-notes-config-fixup: notes.h: fix typos in comment notes: break set_display_notes() into smaller functions config/format.txt: clarify behavior of multiple format.notes format-patch: move git_config() before repo_init_revisions() format-patch: use --notes behavior for format.notes notes: extract logic into set_display_notes() notes: create init_display_notes() helper notes: rename to load_display_notes()

format-patch: use --notes behavior for format.notes

2019-12-09T21:37:20Z

When we had multiple `format.notes` config values where we had ``, `false`, `` (in that order), then we would print out the notes for both `` and ``. This doesn't make sense, however, since we parse the config in a top-down manner and a `false` should be able to override previous configurations, just like how `--no-notes` will override previous `--notes`. Duplicate the logic that handles the `--[no-]notes[=]` option to `format.notes` for consistency. As a result, when parsing the config from top to bottom, `format.notes = true` will behave like `--notes`, `format.notes = ` will behave like `--notes=` and `format.notes = false` will behave like `--no-notes`. This change isn't strictly backwards compatible but since it is an edge case where a sane user would not mix notes refs with `false` and this feature is relatively new (released only in v2.23.0), this change should be harmless. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

format-patch: teach --no-base

2019-12-05T14:06:18Z

If `format.useAutoBase = true`, there was no way to override this from the command-line. Teach the `--no-base` option in format-patch to override `format.useAutoBase`. Helped-by: René Scharfe Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

t4014: use test_config()

2019-12-05T14:06:18Z

Instead of manually unsetting the config after the test case is done, use test_config() to do it automatically. While we're at it, fix a typo in a test case name. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

Merge branch 'dl/format-patch-cover-from-desc'

2019-11-10T09:02:11Z

The branch description ("git branch --edit-description") has been used to fill the body of the cover letters by the format-patch command; this has been enhanced so that the subject can also be filled. * dl/format-patch-cover-from-desc: format-patch: teach --cover-from-description option format-patch: use enum variables format-patch: replace erroneous and condition

Merge branch 'bw/format-patch-o-create-leading-dirs'

2019-10-24T04:34:02Z

Test update. * bw/format-patch-o-create-leading-dirs: t4014: make output-directory tests self-contained

t4014: make output-directory tests self-contained

2019-10-23T02:08:58Z

As noted by Gábor in [1], the new tests in edefc31873 ("format-patch: create leading components of output directory", 2019-10-11) cannot be run independently. Fix this. [1] https://public-inbox.org/git/20191011144650.GM29845@szeder.dev/ Signed-off-by: Bert Wesarg Signed-off-by: Junio C Hamano

Merge branch 'bw/format-patch-o-create-leading-dirs'

2019-10-18T02:40:48Z

"git format-patch -o " did an equivalent of "mkdir " not "mkdir -p ", which is being corrected. * bw/format-patch-o-create-leading-dirs: format-patch: create leading components of output directory

format-patch: teach --cover-from-description option

2019-10-16T01:26:45Z

Before, when format-patch generated a cover letter, only the body would be populated with a branch's description while the subject would be populated with placeholder text. However, users may want to have the subject of their cover letter automatically populated in the same way. Teach format-patch to accept the `--cover-from-description` option and corresponding `format.coverFromDescription` config, allowing users to populate different parts of the cover letter (including the subject now). Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

format-patch: create leading components of output directory

2019-10-12T02:51:20Z

'git format-patch -o ' did an equivalent of 'mkdir ' not 'mkdir -p ', which is being corrected. Avoid the usage of 'adjust_shared_perm' on the leading directories which may have security implications. Achieved by temporarily disabling of 'config.sharedRepository' like 'git init' does. Signed-off-by: Bert Wesarg Signed-off-by: Junio C Hamano