From e2d38cd54491535f409372393baeed787c77388d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 13 Oct 2021 07:34:57 +0200
Subject: Merging upstream version 0.16.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 gitlint/tests/expected/cli/test_cli/test_contrib_1                  | 1 -
 gitlint/tests/expected/cli/test_cli/test_debug_1                    | 4 ++++
 gitlint/tests/expected/cli/test_cli/test_input_stream_debug_2       | 4 ++++
 gitlint/tests/expected/cli/test_cli/test_lint_commit_1              | 2 ++
 gitlint/tests/expected/cli/test_cli/test_lint_staged_msg_filename_2 | 4 ++++
 gitlint/tests/expected/cli/test_cli/test_lint_staged_stdin_2        | 4 ++++
 gitlint/tests/expected/cli/test_cli/test_named_rules_2              | 4 ++++
 7 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 gitlint/tests/expected/cli/test_cli/test_lint_commit_1

(limited to 'gitlint/tests/expected/cli/test_cli')

diff --git a/gitlint/tests/expected/cli/test_cli/test_contrib_1 b/gitlint/tests/expected/cli/test_cli/test_contrib_1
index ed21eca..b95433b 100644
--- a/gitlint/tests/expected/cli/test_cli/test_contrib_1
+++ b/gitlint/tests/expected/cli/test_cli/test_contrib_1
@@ -1,3 +1,2 @@
 1: CC1 Body does not contain a 'Signed-off-by' line
-1: CT1 Title does not start with one of fix, feat, chore, docs, style, refactor, perf, test, revert, ci, build: "Test tïtle"
 1: CT1 Title does not follow ConventionalCommits.org format 'type(optional-scope): description': "Test tïtle"
diff --git a/gitlint/tests/expected/cli/test_cli/test_debug_1 b/gitlint/tests/expected/cli/test_cli/test_debug_1
index a95a58d..fcd5d7e 100644
--- a/gitlint/tests/expected/cli/test_cli/test_debug_1
+++ b/gitlint/tests/expected/cli/test_cli/test_debug_1
@@ -17,6 +17,7 @@ ignore-squash-commits: True
 ignore-revert-commits: True
 ignore-stdin: False
 staged: False
+fail-without-commits: False
 verbosity: 1
 debug: True
 target: {target}
@@ -29,6 +30,9 @@ target: {target}
      regex=None
   I3: ignore-body-lines
      regex=None
+  I4: ignore-by-author-name
+     ignore=all
+     regex=None
   T1: title-max-length
      line-length=20
   T2: title-trailing-whitespace
diff --git a/gitlint/tests/expected/cli/test_cli/test_input_stream_debug_2 b/gitlint/tests/expected/cli/test_cli/test_input_stream_debug_2
index c05d147..7c94b45 100644
--- a/gitlint/tests/expected/cli/test_cli/test_input_stream_debug_2
+++ b/gitlint/tests/expected/cli/test_cli/test_input_stream_debug_2
@@ -17,6 +17,7 @@ ignore-squash-commits: True
 ignore-revert-commits: True
 ignore-stdin: False
 staged: False
+fail-without-commits: False
 verbosity: 3
 debug: True
 target: {target}
@@ -29,6 +30,9 @@ target: {target}
      regex=None
   I3: ignore-body-lines
      regex=None
+  I4: ignore-by-author-name
+     ignore=all
+     regex=None
   T1: title-max-length
      line-length=72
   T2: title-trailing-whitespace
diff --git a/gitlint/tests/expected/cli/test_cli/test_lint_commit_1 b/gitlint/tests/expected/cli/test_cli/test_lint_commit_1
new file mode 100644
index 0000000..b9f0742
--- /dev/null
+++ b/gitlint/tests/expected/cli/test_cli/test_lint_commit_1
@@ -0,0 +1,2 @@
+1: T5 Title contains the word 'WIP' (case-insensitive): "WIP: commït-title1"
+3: B5 Body message is too short (12<20): "commït-body1"
diff --git a/gitlint/tests/expected/cli/test_cli/test_lint_staged_msg_filename_2 b/gitlint/tests/expected/cli/test_cli/test_lint_staged_msg_filename_2
index e8e9f33..f37ffa0 100644
--- a/gitlint/tests/expected/cli/test_cli/test_lint_staged_msg_filename_2
+++ b/gitlint/tests/expected/cli/test_cli/test_lint_staged_msg_filename_2
@@ -17,6 +17,7 @@ ignore-squash-commits: True
 ignore-revert-commits: True
 ignore-stdin: False
 staged: True
+fail-without-commits: False
 verbosity: 3
 debug: True
 target: {target}
@@ -29,6 +30,9 @@ target: {target}
      regex=None
   I3: ignore-body-lines
      regex=None
+  I4: ignore-by-author-name
+     ignore=all
+     regex=None
   T1: title-max-length
      line-length=72
   T2: title-trailing-whitespace
diff --git a/gitlint/tests/expected/cli/test_cli/test_lint_staged_stdin_2 b/gitlint/tests/expected/cli/test_cli/test_lint_staged_stdin_2
index b822edc..1d1020a 100644
--- a/gitlint/tests/expected/cli/test_cli/test_lint_staged_stdin_2
+++ b/gitlint/tests/expected/cli/test_cli/test_lint_staged_stdin_2
@@ -17,6 +17,7 @@ ignore-squash-commits: True
 ignore-revert-commits: True
 ignore-stdin: False
 staged: True
+fail-without-commits: False
 verbosity: 3
 debug: True
 target: {target}
@@ -29,6 +30,9 @@ target: {target}
      regex=None
   I3: ignore-body-lines
      regex=None
+  I4: ignore-by-author-name
+     ignore=all
+     regex=None
   T1: title-max-length
      line-length=72
   T2: title-trailing-whitespace
diff --git a/gitlint/tests/expected/cli/test_cli/test_named_rules_2 b/gitlint/tests/expected/cli/test_cli/test_named_rules_2
index 828e296..83c4bf2 100644
--- a/gitlint/tests/expected/cli/test_cli/test_named_rules_2
+++ b/gitlint/tests/expected/cli/test_cli/test_named_rules_2
@@ -17,6 +17,7 @@ ignore-squash-commits: True
 ignore-revert-commits: True
 ignore-stdin: False
 staged: False
+fail-without-commits: False
 verbosity: 3
 debug: True
 target: {target}
@@ -29,6 +30,9 @@ target: {target}
      regex=None
   I3: ignore-body-lines
      regex=None
+  I4: ignore-by-author-name
+     ignore=all
+     regex=None
   T1: title-max-length
      line-length=72
   T2: title-trailing-whitespace
-- 
cgit v1.2.3