diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:20:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:32 (GMT) |
| commit | af04d8f1a5a38373fba762071824bc85da7cc050 (patch) | |
| tree | 23393f02b962c0ccc3524b029a8c7e02ce7f5bd1 /t/t4013-diff-various.sh | |
| parent | 1d24509b7b865115836982267a5e54b2f7d77c42 (diff) | |
| download | git-af04d8f1a5a38373fba762071824bc85da7cc050.zip git-af04d8f1a5a38373fba762071824bc85da7cc050.tar.gz git-af04d8f1a5a38373fba762071824bc85da7cc050.tar.bz2 | |
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 8d8178a..fa82b5a 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -327,6 +327,8 @@ log --no-diff-merges -p --first-parent master log --diff-merges=off -p --first-parent master log --first-parent --diff-merges=off -p master log -p --first-parent master +log -p --diff-merges=first-parent master +log --diff-merges=first-parent master log -m -p --first-parent master log -m -p master log --cc -m -p master |