git/t, branch v2.19.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.19.22018-11-21T13:58:10ZMerge branch 'sg/test-rebase-editor-fix' into maint2018-11-21T13:58:10ZJunio C Hamanogitster@pobox.com2018-11-21T13:58:10Zurn:sha1:a4830a7a4564b78cb0196b931bd4eea918dd1973
* sg/test-rebase-editor-fix:
t3404-rebase-interactive: test abbreviated commands
Merge branch 'ma/t7005-bash-workaround' into maint2018-11-21T13:58:04ZJunio C Hamanogitster@pobox.com2018-11-21T13:58:04Zurn:sha1:6262f5c4711df705a568a56f3cc2eae34bdc0d0f
Test fix.
* ma/t7005-bash-workaround:
t7005-editor: quote filename to fix whitespace-issue
Merge branch 'ma/t1400-undebug-test' into maint2018-11-21T13:58:01ZJunio C Hamanogitster@pobox.com2018-11-21T13:58:01Zurn:sha1:6f1c8154aa359884aea6d1eb22c61ea323ebb96f
Test fix.
* ma/t1400-undebug-test:
t1400: drop debug `echo` to actually execute `test`
Merge branch 'tg/t5551-with-curl-7.61.1' into maint2018-11-21T13:57:58ZJunio C Hamanogitster@pobox.com2018-11-21T13:57:58Zurn:sha1:2a98f6c2b56c4de74fb9bf35adacca2265388f99
Test update.
Supersedes tz/t5551-with-curl-7.61.1 topic
* tg/t5551-with-curl-7.61.1:
t5551: compare sorted cookies files
t5551: move setup code inside test_expect blocks
Merge branch 'sg/split-index-test' into maint2018-11-21T13:57:57ZJunio C Hamanogitster@pobox.com2018-11-21T13:57:57Zurn:sha1:85f6afc28b64cfd233f80f56896941530df0dcc0
Test updates.
* sg/split-index-test:
t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index
t1700-split-index: drop unnecessary 'grep'
Merge branch 'sg/t3701-tighten-trace' into maint2018-11-21T13:57:55ZJunio C Hamanogitster@pobox.com2018-11-21T13:57:55Zurn:sha1:9beaf81bce99134f9120afc95f913563d46e68cf
Test update.
* sg/t3701-tighten-trace:
t3701-add-interactive: tighten the check of trace output
Merge branch 'jk/detect-truncated-zlib-input' into maint2018-11-21T13:57:52ZJunio C Hamanogitster@pobox.com2018-11-21T13:57:52Zurn:sha1:d75c41b2ae0a4d5dc40af5e7b84afed791bf77c3
A regression in Git 2.12 era made "git fsck" fall into an infinite
loop while processing truncated loose objects.
* jk/detect-truncated-zlib-input:
cat-file: handle streaming failures consistently
check_stream_sha1(): handle input underflow
t1450: check large blob in trailing-garbage test
Merge branch 'sg/test-verbose-log' into maint2018-11-21T13:57:52ZJunio C Hamanogitster@pobox.com2018-11-21T13:57:52Zurn:sha1:0e57d28a3a867cf2a1cef9e429150709b6f89b91
Our test scripts can now take the '-V' option as a synonym for the
'--verbose-log' option.
* sg/test-verbose-log:
test-lib: introduce the '-V' short option for '--verbose-log'
Merge branch 'md/exclude-promisor-objects-fix' into maint2018-11-21T13:57:52ZJunio C Hamanogitster@pobox.com2018-11-21T13:57:52Zurn:sha1:b52ac60bc461a16076209a3027bb15f7c890f148
Operations on promisor objects make sense in the context of only a
small subset of the commands that internally use the revisions
machinery, but the "--exclude-promisor-objects" option were taken
and led to nonsense results by commands like "log", to which it
didn't make much sense. This has been corrected.
* md/exclude-promisor-objects-fix:
exclude-promisor-objects: declare when option is allowed
Documentation/git-log.txt: do not show --exclude-promisor-objects
Merge branch 'js/shallow-and-fetch-prune' into maint2018-11-21T13:57:51ZJunio C Hamanogitster@pobox.com2018-11-21T13:57:51Zurn:sha1:d0975a0724cc8f0f88931264b8b97c8a4c428dda
"git repack" in a shallow clone did not correctly update the
shallow points in the repository, leading to a repository that
does not pass fsck.
* js/shallow-and-fetch-prune:
repack -ad: prune the list of shallow commits
shallow: offer to prune only non-existing entries
repack: point out a bug handling stale shallow info