summaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
AgeCommit message (Expand)AuthorFilesLines
2022-01-12Merge branch 'fs/ssh-signing-key-lifetime'Libravatar Junio C Hamano1-0/+8
2022-01-10fmt-merge-msg: prevent use-after-free with signed tagsLibravatar Taylor Blau1-0/+8
2022-01-05Merge branch 'jc/merge-detached-head-name'Libravatar Junio C Hamano1-1/+41
2022-01-03Merge branch 'es/test-chain-lint'Libravatar Junio C Hamano1-1/+1
2021-12-20merge: allow to pretend a merge is made into a different branchLibravatar Junio C Hamano1-1/+41
2021-12-13t6000-t9999: detect and signal failure within loopLibravatar Eric Sunshine1-1/+1
2021-12-09ssh signing: make fmt-merge-msg consider key lifetimeLibravatar Fabian Stelzer1-0/+58
2021-12-09t/fmt-merge-msg: make gpgssh tests more specificLibravatar Fabian Stelzer1-0/+2
2021-12-09t/fmt-merge-msg: do not redirect stderrLibravatar Fabian Stelzer1-4/+4
2021-10-12ssh signing: fmt-merge-msg tests & config parseLibravatar Fabian Stelzer1-0/+28
2020-11-19t6[0-3]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-26/+26
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-10-23t6200: adjust suppression pattern to also match "main"Libravatar Johannes Schindelin1-1/+1
2020-07-30fmt-merge-msg: allow merge destination to be omitted againLibravatar Junio C Hamano1-0/+20
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Libravatar Junio C Hamano1-18/+18
2020-06-23fmt-merge-msg: stop treating `master` speciallyLibravatar Johannes Schindelin1-18/+18
2020-05-29t: avoid alternation (not POSIX) in grep's BRELibravatar Carlo Marcelo Arenas Belón1-1/+1
2020-03-15t: increase test coverage of signature verification outputLibravatar Hans Jerry Illikainen1-0/+23
2019-07-23t6200: use test_commit_bulkLibravatar Jeff King1-6/+1
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'Libravatar SZEDER Gábor1-3/+1
2018-02-16merge: allow fast-forward when merging a tracked tagLibravatar Junio C Hamano1-1/+1
2015-03-20t: fix trivial &&-chain breakageLibravatar Jeff King1-1/+1
2013-04-19Merge branch 'rt/commentchar-fmt-merge-msg'Libravatar Junio C Hamano1-3/+3
2013-04-18t6200: avoid path mangling issue on WindowsLibravatar Johannes Sixt1-3/+3
2013-04-15Merge branch 'rt/commentchar-fmt-merge-msg'Libravatar Junio C Hamano1-0/+18
2013-04-07fmt-merge-msg: respect core.commentchar in people creditsLibravatar Ralf Thielow1-0/+18
2013-04-01t6200: test message for merging of an annotated tagLibravatar Junio C Hamano1-0/+39
2013-04-01t6200: use test_config/test_unconfigLibravatar Junio C Hamano1-32/+29
2012-06-06fmt-merge-msg: make attribution into comment linesLibravatar Junio C Hamano1-18/+18
2012-03-13fmt-merge-msg: show those involved in a merged seriesLibravatar Junio C Hamano1-3/+24
2010-09-09t6200-fmt-merge-msg: Exercise '--log' to configure shortlog lengthLibravatar Ramkumar Ramachandra1-0/+43
2010-09-09t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog lengthLibravatar Ramkumar Ramachandra1-0/+48
2010-08-18fmt-merge-msg -m to override merge titleLibravatar Jonathan Nieder1-0/+32
2010-08-18t6200 (fmt-merge-msg): style nitpicksLibravatar Jonathan Nieder1-160/+120
2010-03-24t6200: test fmt-merge-msg moreLibravatar Stephen Boyd1-0/+115
2010-03-24t6200: modernize with test_tickLibravatar Stephen Boyd1-35/+29
2010-03-24fmt-merge-msg: be quiet if nothing to mergeLibravatar Stephen Boyd1-0/+19
2009-05-29Merge branch 'sb/maint-1.6.2-opt-filename-fix'Libravatar Junio C Hamano1-0/+32
2009-05-23apply, fmt-merge-msg: use relative filenamesLibravatar Stephen Boyd1-0/+32
2009-03-19Tests on Windows: $(pwd) must return Windows-style pathsLibravatar Johannes Sixt1-2/+2
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryLibravatar Junio C Hamano1-2/+2
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-8/+8
2008-05-14Merge branch 'bd/tests'Libravatar Junio C Hamano1-3/+3
2008-05-05Rename the test trash directory to contain spaces.Libravatar Bryan Donlan1-3/+3
2008-04-12fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableLibravatar SZEDER Gábor1-3/+51
2007-03-04Get rid of the dependency to GNU diff in the testsLibravatar Johannes Schindelin1-5/+5
2007-01-28[PATCH] Rename git-repo-config to git-config.Libravatar Tom Prince1-3/+3
2006-07-03t6200: fmt-merge-msg test.Libravatar Junio C Hamano1-0/+163
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 17:15:05 +0000