summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pbr/packaging.py2
-rw-r--r--pbr/tests/test_setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py
index f01ce1e..d6aeb64 100644
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -322,7 +322,7 @@ def generate_authors(git_dir=None, dest_dir='.', option_dict=dict()):
authors = []
# don't include jenkins email address in AUTHORS file
- git_log_cmd = ['log', '--use-mailmap', '--format=%aN <%aE>']
+ git_log_cmd = ['log', '--format=%aN <%aE>']
authors += _run_git_command(git_log_cmd, git_dir).split('\n')
authors = [a for a in authors if not re.search(ignore_emails, a)]
diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py
index 960de99..0ded02b 100644
--- a/pbr/tests/test_setup.py
+++ b/pbr/tests/test_setup.py
@@ -151,7 +151,7 @@ class GitLogsTest(base.BaseTestCase):
co_author_by = u"Co-authored-by: " + co_author
git_log_cmd = (
- "git --git-dir=%s log --use-mailmap --format=%%aN <%%aE>"
+ "git --git-dir=%s log --format=%%aN <%%aE>"
% self.git_dir)
git_co_log_cmd = ("git --git-dir=%s log" % self.git_dir)
git_top_level = "git rev-parse --show-toplevel"