4415 Commits (af6e17519978eed17c406206e1afc9f0501abf77)

Author SHA1 Message Date
Elijah Newren af6e175199 t6022: Add test combinations of {content conflict?, D/F conflict remains?} 15 years ago
Elijah Newren df0b99f004 t6032: Add a test checking for excessive output from merge 15 years ago
Schalk, Ken 8a1c0d322e t3030: Add a testcase for resolvable rename/add conflict with symlinks 15 years ago
Brandon Casey 84d694027f t/t7300: workaround ancient touch by rearranging arguments 15 years ago
Brian Gernhardt 77f2e4f5f3 t7003: Use test_commit instead of custom function 15 years ago
Junio C Hamano b294ed637d ls-tree $di $dir: do not mistakenly recurse into directories 15 years ago
Junio C Hamano e22148f406 t3101: modernise style 15 years ago
Brandon Casey 99f55ebc67 t/t4018: avoid two unnecessary sub-shell invocations 15 years ago
Brandon Casey bff4206121 t/t4018: test whether the word_regex patterns compile 15 years ago
Brandon Casey 042cca3886 t/t5510-fetch.sh: improve testing with explicit URL and merge spec 15 years ago
Brandon Casey f98548764e t/t7008: workaround broken handling of \000 by printf on IRIX 15 years ago
Elijah Newren 86273e5764 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir 15 years ago
Elijah Newren 56bfd762e5 t3509: Add rename + D/F conflict testcase that recursive strategy fails 15 years ago
Jens Lehmann fd3c32c981 t1020: Get rid of 'cd "$HERE"' at the start of each test 15 years ago
Jonathan Nieder a814615a6a t2016 (checkout -p): add missing && 15 years ago
Jonathan Nieder 8fe5aeddcb t1302 (core.repositoryversion): style tweaks 15 years ago
Jonathan Nieder 76bbcd4382 t2105 (gitfile): add missing && 15 years ago
Jonathan Nieder dbedf8bf42 t1450 (fsck): remove dangling objects 15 years ago
Jonathan Nieder 18a8269242 tests: subshell indentation stylefix 15 years ago
Jens Lehmann fd4ec4f2bb Several tests: cd inside subshell instead of around 15 years ago
Jens Lehmann c2e0940b44 t3404 & t7508: cd inside subshell instead of around 15 years ago
Jens Lehmann 65b26eb466 t5505: add missing && 15 years ago
Nguyễn Thái Ngọc Duy 2e3400c052 parse_object: pass on the original sha1, not the replaced one 15 years ago
Schalk, Ken d5af51053c RE: [PATCH] Avoid rename/add conflict when contents are identical 15 years ago
Jens Lehmann 4bf9dd9782 t7406 & t7407: add missing && at end of lines 15 years ago
Jens Lehmann 1e2847634e t7405: cd inside subshell instead of around 15 years ago
Matthieu Moy c5978a507c t7609-merge-co-error-msgs: test non-fast forward case too. 15 years ago
Matthieu Moy e4c62e640d tests: factor HOME=$(pwd) in test-lib.sh 15 years ago
Ævar Arnfjörð Bjarmason 0d314ce834 test-lib: use subshell instead of cd $new && .. && cd $old 15 years ago
Jonathan Nieder 07431fc8dc tests: simplify "missing PREREQ" message 15 years ago
Ævar Arnfjörð Bjarmason 7b90511970 t/t0000-basic.sh: Run the passing TODO test inside its own test-lib 15 years ago
Ævar Arnfjörð Bjarmason 62f539043c test-lib: Allow overriding of TEST_DIRECTORY 15 years ago
Ævar Arnfjörð Bjarmason 6cec5c6835 test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ 15 years ago
Ævar Arnfjörð Bjarmason aed604c778 test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ 15 years ago
Thomas Rast 568899539d test: Introduce $GIT_BUILD_DIR 15 years ago
Jonathan Nieder d0b8a61742 tests: make test_might_fail fail on missing commands 15 years ago
Jonathan Nieder 5c8e141414 tests: make test_might_fail more verbose 15 years ago
Johan Herland 1ee1e43df3 notes: Don't create (empty) commit when removing non-existing notes 15 years ago
Jeff King a54ce3ca9e tests: make test_must_fail fail on missing commands 15 years ago
Jeff King 16034fbe59 tests: make test_must_fail more verbose 15 years ago
Jon Seymour 8d66bb0587 t3903: fix broken test_must_fail calls 15 years ago
Jon Seymour ba9eab7bfd t1503: fix broken test_must_fail calls 15 years ago
Jens Lehmann 23b4c7bcc5 checkout: Use submodule.*.ignore settings from .git/config and .gitmodules 15 years ago
Jens Lehmann 62ed009642 checkout: Add test for diff.ignoreSubmodules 15 years ago
Matthieu Moy 520ea857e6 t0003: add missing && at end of lines 15 years ago
Csaba Henk 7ec344d802 filter-branch: retire --remap-to-ancestor 15 years ago
Csaba Henk 0f5cdf653b bundle: detect if bundle file cannot be created 15 years ago
Brandon Casey 3ee1757bae builtin/fetch.c: ignore merge config when not fetching from branch's remote 15 years ago
Brandon Casey 6106ce4669 t/t5510: demonstrate failure to fetch when current branch has merge ref 15 years ago
Jon Seymour 9c46c054ae rev-parse: tests git rev-parse --verify master@{n}, for various n 15 years ago