summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
AgeCommit message (Expand)AuthorFilesLines
2020-11-02t5515: use `main` as the name of the main branch for testing (part 1)Libravatar Johannes Schindelin1-12/+20
2020-09-26tests: avoid variations of the `master` branch nameLibravatar Johannes Schindelin1-3/+3
2020-02-17Merge branch 'bc/hash-independent-tests-part-8'Libravatar Junio C Hamano1-5/+54
2020-02-07t5515: make test hash independentLibravatar brian m. carlson1-5/+54
2020-01-15test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriateLibravatar Jonathan Nieder1-1/+2
2019-09-05t: use LF variable defined in the test harnessLibravatar Junio C Hamano1-3/+0
2019-03-07tests: fix protocol version for overspecificationsLibravatar Jonathan Tan1-0/+4
2015-12-28t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitu...Libravatar Elia Pinto1-2/+2
2009-03-19test-lib: Simplify test counting.Libravatar Johannes Sixt1-2/+1
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryLibravatar Junio C Hamano1-2/+2
2008-06-19Prepare testsuite for a "git clone" that packs refsLibravatar Johan Herland1-3/+6
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-2/+2
2008-03-26git-fetch test: test tracking fetch results, not just FETCH_HEADLibravatar Junio C Hamano1-7/+19
2007-09-19Don't attempt to merge non-existant remotes in t5515Libravatar Shawn O. Pearce1-2/+1
2007-03-10Merge branch 'js/diff-ni'Libravatar Junio C Hamano1-1/+1
2007-03-07t/t5515-fetch-merge-logic.sh: Add two more testsLibravatar Santi B,Ai(Bjar1-0/+1
2007-03-05t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetchLibravatar Santi BĂ©jar1-0/+161