From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jan 2021 22:19:20 +0000 (-0800)
Subject: Merge branch 'ab/mailmap-fixup'
X-Git-Tag: v2.31.0-rc0~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7bb322cba9f45f6b0294b7d1ef272013902b169;p=thirdparty%2Fgit.git

Merge branch 'ab/mailmap-fixup'

Follow-up fixes and improvements to ab/mailmap topic.

* ab/mailmap-fixup:
  t4203: make blame output massaging more robust
  mailmap doc: use correct environment variable 'GIT_WORK_TREE'
  t4203: stop losing return codes of git commands
  test-lib-functions.sh: fix usage for test_commit()
---

b7bb322cba9f45f6b0294b7d1ef272013902b169