Merging upstream version 1.70.0+dfsg2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 26 insertions, 0 deletions

diff --git a/vendor/gix-mailmap/tests/fixtures/invalid.txt b/vendor/gix-mailmap/tests/fixtures/invalid.txt
new file mode 100644
index 000000000..c579c5bd5
--- /dev/null
+++ b/vendor/gix-mailmap/tests/fixtures/invalid.txt
@@ -0,0 +1,5 @@
+# comment
+
+<missing closing brace
+
+just a name
diff --git a/vendor/gix-mailmap/tests/fixtures/overwrite.txt b/vendor/gix-mailmap/tests/fixtures/overwrite.txt
new file mode 100644
index 000000000..5ab9312f2
--- /dev/null
+++ b/vendor/gix-mailmap/tests/fixtures/overwrite.txt
@@ -0,0 +1,13 @@
+# overwrite previously seen values
+
+A <old-a-email>
+A-overwritten <old-a-email>
+
+B <new-b-email> <old-b-email>
+B-overwritten <new-b-email-overwritten> <old-b-email>
+
+C <new-c-email> old-C <old-c-email>
+C-overwritten <new-c-email-overwritten> old-C <old-c-email>
+
+<new-d-email> <old-d-email>
+<new-d-email-overwritten> <old-d-email>
diff --git a/vendor/gix-mailmap/tests/fixtures/typical.txt b/vendor/gix-mailmap/tests/fixtures/typical.txt
new file mode 100644
index 000000000..563b9ddd9
--- /dev/null
+++ b/vendor/gix-mailmap/tests/fixtures/typical.txt
@@ -0,0 +1,8 @@
+# from the mailmap docs
+
+Joe R. Developer <joe@example.com>
+Joe R. Developer <joe@example.com> Joe <bugs@example.com>
+
+Jane Doe <jane@example.com> <jane@laptop.(none)>
+Jane Doe <jane@example.com> <jane@desktop.(none)>
+Jane Doe <jane@example.com> Jane <bugs@example.com>