aboutsummaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
AgeCommit message (Expand)Author
2026-03-16t4200: convert test -[df] checks to test_path_* helpersPRASHANT S BISHT
2025-04-07t: refactor tests depending on Perl substitution operatorPatrick Steinhardt
2025-04-07t: refactor tests depending on Perl transliteration operatorPatrick Steinhardt
2025-04-07t: introduce PERL_TEST_HELPERS prerequisitePatrick Steinhardt
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt
2024-08-01builtin/rerere: fix various trivial memory leaksPatrick Steinhardt
2024-04-23Merge branch 'mr/rerere-crash-fix'Junio C Hamano
2024-04-16rerere: fix crashes due to unmatched opening conflict markersMarcel Röthke
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano
2022-07-18t4200: drop irrelevant codeMartin Ågren
2020-11-19t4*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-08-13Merge branch 'ma/test-quote-cleanup'Junio C Hamano
2020-08-06t: don't spuriously close and reopen quotesMartin Ågren
2020-07-30t: remove test_oid_init in testsbrian m. carlson
2020-01-15t4200: make hash size independentbrian m. carlson
2018-09-24Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano
2018-09-17Merge branch 'tg/rerere'Junio C Hamano
2018-09-11rerere: avoid buffer overrunElijah Newren
2018-09-11t4200: demonstrate rerere segfault on specially crafted mergeElijah Newren
2018-08-06rerere: recalculate conflict ID when unresolved conflict is committedThomas Gummerer
2018-08-06rerere: teach rerere to handle nested conflictsThomas Gummerer
2018-08-06rerere: fix crash with files rerere can't handleThomas Gummerer
2018-07-30tests: make use of the test_must_be_empty functionÆvar Arnfjörð Bjarmason
2018-05-14t: switch $_z40 to $ZERO_OIDbrian m. carlson
2018-04-25Merge branch 'ps/test-chmtime-get'Junio C Hamano
2018-04-09t/helper: 'test-chmtime (--get|-g)' to print only the mtimePaul-Sebastian Ungureanu
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy
2017-08-22rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano
2017-08-22t4200: parameterize "rerere gc" custom expiry testJunio C Hamano
2017-08-22t4200: gather "rerere gc" togetherJunio C Hamano
2017-08-22t4200: make "rerere gc" test more robustJunio C Hamano
2017-08-22t4200: give us a clean slate after "rerere gc" testsJunio C Hamano
2016-04-06rerere: adjust 'forget' to multi-variant world orderJunio C Hamano
2016-04-06rerere: gc and clearJunio C Hamano
2016-03-15rerere: do use multiple variantsJunio C Hamano
2016-03-15t4200: rerere a merge with two identical conflictsJunio C Hamano
2016-03-15rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano
2013-11-06Merge branch 'fc/trivial'Junio C Hamano
2013-10-31t: replace pulls with mergesFelipe Contreras
2013-10-29t: use perl instead of "$PERL_PATH" where applicableJeff King
2012-08-27Fix tests under GETTEXT_POISON on parseoptJiang Xin
2012-06-24tests: enclose $PERL_PATH in double quotesJunio C Hamano
2012-06-12t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-08-06rerere: migrate to parse-options APIJonathan Nieder
2010-08-06t4200 (rerere): modernize styleJonathan Nieder
2010-07-14rerere: fix overeager gcSZEDER Gábor
2010-03-20Use test_expect_success for test setupsBrian Gernhardt
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 03:33:02 +0000