From 748a7fe9ce22500debdd60f446c73d4bbf971a75 Mon Sep 17 00:00:00 2001
From: Lucas Werkmeister <lucas.werkmeister@wikimedia.de>
Date: Mon, 2 Sep 2019 12:40:09 +0200
Subject: [PATCH] =?utf8?q?Fix=20duplicate=20Jon=20Harald=20S=C3=B8by=20in?=
 =?utf8?q?=20CREDITS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

There are some commits from “jhsoby <jhsoby@gmail.com>”. Update the
.mailmap to correct the name of those commits (the existing line would
only update <jhsoby@users.mediawiki.org> commits), and remove the jhsoby
line from the CREDITS.

Also remove jeblad from CREDITS – he already has a .mailmap entry
mapping <john.blad@wikimedia.de> to John Erling Blad, but
maintenance/updateCredits.php never removes CREDITS entries, so while it
adds a correct John Erling Blad entry it won’t remove jeblad by itself.

Change-Id: I987d1cb1e5190899d944c0880211296580abbcb6
---
 .mailmap | 1 +
 CREDITS  | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0f5413e4d3..a0316a3459 100644
--- a/.mailmap
+++ b/.mailmap
@@ -233,6 +233,7 @@ Joel Sahleen <jsahleen@wikimedia.org>
 John Du Hart <john@compwhizii.net> <johnduhart@users.mediawiki.org>
 John Erling Blad <john.blad@wikimedia.de>
 Jon Harald Søby <jhsoby@gmail.com> <jhsoby@users.mediawiki.org>
+Jon Harald Søby <jhsoby@gmail.com>
 Jon Robson <jrobson@wikimedia.org>
 Jon Robson <jrobson@wikimedia.org> <jdlrobson@gmail.com>
 Juliusz Gonera <jgonera@gmail.com>
diff --git a/CREDITS b/CREDITS
index 319b56683f..140ada2b7a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -314,7 +314,6 @@ The following list can be found parsed under Special:Version/Credits -->
 * Jaska Zedlik
 * Jason Richey
 * Jayprakash12345
-* jeblad
 * Jeff Hobson
 * Jeff Janes
 * jeff303
@@ -328,7 +327,6 @@ The following list can be found parsed under Special:Version/Credits -->
 * Jerome Jamnicky
 * Jesús Martínez Novo
 * jhobs
-* jhsoby
 * Jiabao
 * Jidanni
 * Jimmy Collins
-- 
2.20.1