git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1d24509)
t4013: add tests for --diff-merges=first-parent
authorSergey Organov <redacted>
Mon, 21 Dec 2020 15:20:00 +0000 (18:20 +0300)
committerJunio C Hamano <redacted>
Mon, 21 Dec 2020 21:47:32 +0000 (13:47 -0800)
commitaf04d8f1a5a38373fba762071824bc85da7cc050
tree23393f02b962c0ccc3524b029a8c7e02ce7f5bd1tree | snapshot
parent1d24509b7b865115836982267a5e54b2f7d77c42commit | diff
t4013: add tests for --diff-merges=first-parent

This new option provides essential new functionality, changing diff
output to first parent only, without changing history traversal mode,
so it deserves its own test.

As we do it, add additional test that --diff-merges=first-parent by
itself doesn't imply -p and only outputs diffs for merge commits.

Signed-off-by: Sergey Organov <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t4013-diff-various.sh diff | blob | history
t/t4013/diff.log_--diff-merges=first-parent_master [new file with mode: 0644] blob
t/t4013/diff.log_-p_--diff-merges=first-parent_master [new file with mode: 0644] blob
git clone https://git.99rst.org/PROJECT