summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2017-05-25 19:45:32 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-26 12:52:37 +0900
commit967a3eaf432db124cabaa4595677063d5b931ff8 (patch)
tree0752e388d7597da12f3e7081ad27328a71a901d9 /Documentation/git-merge-one-file.txt
parenttest-lib: add a PTHREADS prerequisite (diff)
downloadtgif-967a3eaf432db124cabaa4595677063d5b931ff8.tar.xz
pack-objects & index-pack: add test for --threads warning
Add a test for the warning that's emitted when --threads or pack.threads is provided under NO_PTHREADS=YesPlease. This uses the new PTHREADS prerequisite. The assertion for C_LOCALE_OUTPUT in the latter test is currently redundant, since unlike index-pack the pack-objects warnings aren't i18n'd. However they might be changed to be i18n'd in the future, and there's no harm in future-proofing the test. There's an existing bug in the implementation of pack-objects which this test currently tests for as-is. Details about the bug & the fix are included in a follow-up change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions