Google Git
Sign in
googlers / jrn / git / b388633c5c47bf4fc12560d8b237ec0bd319ba4a / t / t6415-merge-dir-to-symlink.sh
  1. e5e3751 tests: mark tests as passing with SANITIZE=leak by Ævar Arnfjörð Bjarmason · 2 years, 4 months ago
  2. f222bd3 tests: remove leftover untracked files by Elijah Newren · 3 years, 6 months ago
  3. 5902f5f t6[4-9]*: adjust the references to the default branch name "main" by Johannes Schindelin · 4 years, 4 months ago
  4. 334afbc tests: mark tests relying on the current default for `init.defaultBranch` by Johannes Schindelin · 4 years, 4 months ago
  5. 919df31 Collect merge-related tests to t64xx by Elijah Newren · 4 years, 7 months ago[Renamed from t/t6035-merge-dir-to-symlink.sh]
  6. b821ca7 t6020, t6022, t6035: update merge tests to use test helper functions by Elijah Newren · 5 years ago
  7. bfd7804 t6035: use test_ln_s_add to remove SYMLINKS prerequisite by Johannes Sixt · 12 years ago
  8. 1d718a5 do not overwrite untracked symlinks by Clemens Buchacher · 14 years ago
  9. a2c6726 Merge branch 'ab/test-2' by Junio C Hamano · 15 years ago
  10. 3f29dd6 Merge branch 'en/d-f-conflict-fix' by Junio C Hamano · 15 years ago
  11. 41be8ea tests: implicitly skip SYMLINKS tests using <prereq> by Ævar Arnfjörð Bjarmason · 15 years ago
  12. 2fd1ea1 t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test by Ævar Arnfjörð Bjarmason · 15 years ago
  13. 3734893 merge-recursive: Fix D/F conflicts by Elijah Newren · 15 years ago
  14. f15652d Add additional testcases for D/F conflicts by Elijah Newren · 15 years ago
  15. fadb515 tests: Skip tests in a way that makes sense under TAP by Ævar Arnfjörð Bjarmason · 15 years ago
  16. df3dac3 tests: update tests that used to fail by Junio C Hamano · 15 years ago
  17. cee2d6a Aggressive three-way merge: fix D/F case by Junio C Hamano · 15 years ago
  18. 1ee2657 traverse_trees(): handle D/F conflict case sanely by Junio C Hamano · 15 years ago
  19. b6b0737 t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite by Johannes Sixt · 16 years ago
  20. b6986d8 git-checkout: be careful about untracked symlinks by Linus Torvalds · 16 years ago
  21. 7771675 lstat_cache: guard against full match of length of 'name' parameter by Kjetil Barvik · 16 years ago
  22. 4f6339b Demonstrate bugs when a directory is replaced with a symlink by Pickens, James E · 16 years ago