]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d826e9) | patch
t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks
authorSergey Organov <sorganov@gmail.com>
Fri, 14 Dec 2018 04:53:51 +0000 (07:53 +0300)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Dec 2018 22:43:21 +0000 (14:43 -0800)
commitc812bd4669d8907186dab8aed47f2c83dfb93fff
tree0655a9bd7d62fb7954ab7eb1e756a75ddddabc5ftree | snapshot
parent5d826e972970a784bd7a7bdf587512510097b8c7commit | diff
t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks

We are going to allow 'git cherry-pick -m 1' for non-merge commits, so
this method to force failure will stop to work.

Use '-m 4' instead as it's very unlikely we will ever have such an
octopus in this test setup.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3510-cherry-pick-sequence.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.