git/ci
Junio C Hamano 7bec8e7fa6 Merge branch 'en/ort-readiness'
Plug the ort merge backend throughout the rest of the system, and
start testing it as a replacement for the recursive backend.

* en/ort-readiness:
  Add testing with merge-ort merge strategy
  t6423: mark remaining expected failure under merge-ort as such
  Revert "merge-ort: ignore the directory rename split conflict for now"
  merge-recursive: add a bunch of FIXME comments documenting known bugs
  merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
  t: mark several submodule merging tests as fixed under merge-ort
  merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
  t6428: new test for SKIP_WORKTREE handling and conflicts
  merge-ort: support subtree shifting
  merge-ort: let renormalization change modify/delete into clean delete
  merge-ort: have ll_merge() use a special attr_index for renormalization
  merge-ort: add a special minimal index just for renormalization
  merge-ort: use STABLE_QSORT instead of QSORT where required
2021-04-16 13:53:34 -07:00
..
config ci/config: correct instruction for CI preferences 2020-05-18 10:18:34 -07:00
util travis-ci: include the trash directories of failed tests in the trace log 2018-08-01 09:59:36 -07:00
install-dependencies.sh Merge branch 'ab/detox-gettext-tests' 2021-02-10 14:48:33 -08:00
install-docker-dependencies.sh travis: build and test on Linux with musl libc and busybox 2020-04-06 13:44:42 -07:00
lib.sh ci: remove GETTEXT_POISON jobs 2021-01-21 15:50:00 -08:00
make-test-artifacts.sh ci: parallelize testing on Windows 2019-01-29 09:26:47 -08:00
mount-fileshare.sh Add a build definition for Azure DevOps 2019-01-29 09:26:46 -08:00
print-test-failures.sh ci: avoid set-env construct in print-test-failures.sh 2020-11-17 12:12:30 -08:00
run-build-and-tests.sh Merge branch 'en/ort-readiness' 2021-04-16 13:53:34 -07:00
run-docker-build.sh travis: build and test on Linux with musl libc and busybox 2020-04-06 13:44:42 -07:00
run-docker.sh travis: build and test on Linux with musl libc and busybox 2020-04-06 13:44:42 -07:00
run-static-analysis.sh ci: run hdr-check as part of the Static Analysis job 2019-10-03 10:34:57 +09:00
run-test-slice.sh ci: parallelize testing on Windows 2019-01-29 09:26:47 -08:00
test-documentation.sh ci: ignore rubygems warning in the "Documentation" job 2020-02-10 09:52:27 -08:00