| commit | c812bd4669d8907186dab8aed47f2c83dfb93fff | |
| author | Sergey Organov <sorganov@gmail.com> | |
| Fri, 14 Dec 2018 04:53:51 +0000 (14 07:53 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Dec 2018 22:43:21 +0000 (26 14:43 -0800) | ||
| tree | 0655a9bd7d62fb7954ab7eb1e756a75ddddabc5f | treesnapshot (tar.gz zip) |
| parent | 5d826e972970a784bd7a7bdf587512510097b8c7 | commitdiff |
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>
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 | diffblobblamehistory |