aboutsummaryrefslogtreecommitdiff
path: root/t/t3425-rebase-topology-merges.sh
Commit message (Collapse)AuthorAge
* t: fix trivial &&-chain breakageJeff King2015-03-20
| | | | | | | | | | | | These are tests which are missing a link in their &&-chain, but during a setup phase. We may fail to notice failure in commands that build the test environment, but these are typically not expected to fail at all (but it's still good to double-check that our test environment is what we expect). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* rebase topology tests: fix commit names on case-insensitive file systemsJohannes Sixt2013-06-18
| | | | | | | | | | | | | | The recently introduced tests used uppercase letters to denote cherry-picks of commits having the corresponding lowercase letter names. The helper functions also set up tags with the names of the commits. But this constellation fails on case-insensitive file systems because there cannot be distinct tags with names that differ only in case. Use a less subtle convention for the names of cherry-picked commits. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* add tests for rebasing merged historyMartin von Zweigbergk2013-06-07
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>