diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-27 02:40:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-27 02:40:30 +0300 |
| commit | b2ed5ae80a1b45ac00c4c891e693ffcde34a9347 (patch) | |
| tree | c71994f5b195a1c0d6e709e912fdce63b5c47b4e /t | |
| parent | c7dd1c5818111a86deffde1190b57d07efbeed0a (diff) | |
| parent | bc6bf2d7641d6c2450b347d5a0b2f954728bf4d9 (diff) | |
Merge branch 'ak/format-patch-odir-config'
"git format-patch" learned to notice format.outputDirectory
configuration variable. This allows "-o <dir>" option to be
omitted on the command line if you always use the same directory in
your workflow.
* ak/format-patch-odir-config:
format-patch: introduce format.outputDirectory configuration
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 646c4750ec..3b99434e3e 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1445,4 +1445,19 @@ test_expect_success 'From line has expected format' ' test_cmp from filtered ' +test_expect_success 'format-patch format.outputDirectory option' ' + test_config format.outputDirectory patches && + rm -fr patches && + git format-patch master..side && + test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l) +' + +test_expect_success 'format-patch -o overrides format.outputDirectory' ' + test_config format.outputDirectory patches && + rm -fr patches patchset && + git format-patch master..side -o patchset && + test_path_is_missing patches && + test_path_is_dir patchset +' + test_done |