Google Git
Sign in
googlers / jrn / git / d877418390168c9696fd46d5e78ca3362f26f74c / t / t6042-merge-rename-corner-cases.sh
  1. 48c9cb9 merge-recursive: improve rename/rename(1to2)/add[/add] handling by Elijah Newren · 6 years ago
  2. bbafc9c merge-recursive: improve handling for rename/rename(2to1) conflicts by Elijah Newren · 6 years ago
  3. 7f86716 merge-recursive: fix rename/add conflict handling by Elijah Newren · 6 years ago
  4. b28eeb3 t6036, t6042: testcases for rename collision of already conflicting files by Elijah Newren · 6 years ago
  5. bb05c9f t6042: add tests for consistency in file collision conflict handling by Elijah Newren · 6 years ago
  6. 8ba8642 Merge branch 'en/abort-df-conflict-fixes' by Junio C Hamano · 7 years ago
  7. 84e74c6 Merge branch 'en/t6042-insane-merge-rename-testcases' by Junio C Hamano · 7 years ago
  8. ad37620 read-cache: fix directory/file conflict handling in read_index_unmerged() by Elijah Newren · 7 years ago
  9. c8ce376 t6000-t6999: fix broken &&-chains by Eric Sunshine · 7 years ago
  10. 651f7f3 t6042: add testcase covering long chains of rename conflicts by Elijah Newren · 7 years ago
  11. eee7338 t6042: add testcase covering rename/rename(2to1)/delete/delete conflict by Elijah Newren · 7 years ago
  12. 11d9ade t6042: add testcase covering rename/add/delete conflict type by Elijah Newren · 7 years ago
  13. 6ac767e t6036, t6042: prefer test_cmp to sequences of test by Elijah Newren · 7 years ago
  14. 5b0b971 t6036, t6042: prefer test_path_is_file, test_path_is_missing by Elijah Newren · 7 years ago
  15. 0cdabc1 t6036, t6042: use test_line_count instead of wc -l by Elijah Newren · 7 years ago
  16. 2a4c19e t6036, t6042: use test_create_repo to keep tests independent by Elijah Newren · 7 years ago
  17. 55653a6 i18n: merge-recursive: mark strings for translation by Jiang Xin · 13 years ago
  18. 3fb0459 tests: modernise style: more uses of test_line_count by Stefano Lattarini · 13 years ago
  19. 3672c97 merge-recursive: Fix working copy handling for rename/rename/add/add by Elijah Newren · 14 years ago
  20. 1ac91b3 merge-recursive: add handling for rename/rename/add-dest/add-dest by Elijah Newren · 14 years ago
  21. 434b852 merge-recursive: Consider modifications in rename/rename(2to1) conflicts by Elijah Newren · 14 years ago
  22. 3c217c0 merge-recursive: Provide more info in conflict markers with file renames by Elijah Newren · 14 years ago
  23. 51931bf merge-recursive: Improve handling of rename target vs. directory addition by Elijah Newren · 14 years ago
  24. 531357a merge-recursive: Fix deletion of untracked file in rename/delete conflicts by Elijah Newren · 14 years ago
  25. c696606 t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts by Elijah Newren · 14 years ago
  26. f0b75fc t6042: Ensure rename/rename conflicts leave index and workdir in sane state by Elijah Newren · 14 years ago
  27. ac6e839 t6042: Add tests for content issues with modify/rename/directory conflicts by Elijah Newren · 14 years ago
  28. a0551f2 t6042: Add a testcase where undetected rename causes silent file deletion by Elijah Newren · 14 years ago
  29. 7b4ed59 t6042: Add a pair of cases where undetected renames cause issues by Elijah Newren · 14 years ago
  30. 5804023 t6042: Add failing testcase for rename/modify/add-source conflict by Elijah Newren · 14 years ago
  31. 695576f t6042: Add a testcase where git deletes an untracked file by Elijah Newren · 14 years ago