Merge branch 'ab/mailmap-fixup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:20 +0000 (14:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:20 +0000 (14:19 -0800)
commitb7bb322cba9f45f6b0294b7d1ef272013902b169
treeef712b149cf1b49d95f2497dbd0619f2c68d1897
parentbcaaf972e61459e6bfca27144b5d5b66bc51df8c
parent2d02bc91c0aa1ced659a21ce75befcd033a4f923
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()
t/t4203-mailmap.sh
t/test-lib-functions.sh