The simple two-commit test-repository created by 'setup' is no longer needed by any of the tests retrofitted to use check-mailmap. Subsequent, more complex tests of git-shortlog, git-log, and git-blame functionality expand the repository by adding five commits. Consolidate the creation of this seven-commit repository into a single setup function. Signed-off-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx> --- t/t4203-mailmap.sh | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index 48a000b..9c3c83a 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -22,10 +22,36 @@ test_expect_success setup ' git add one && test_tick && git commit -m initial && + echo two >>one && git add one && test_tick && - git commit --author "nick1 <bugs@xxxxxxxxxx>" -m second + git commit --author "nick1 <bugs@xxxxxxxxxx>" -m second && + + echo three >>one && + git add one && + test_tick && + git commit --author "nick2 <bugs@xxxxxxxxxx>" -m third && + + echo four >>one && + git add one && + test_tick && + git commit --author "nick2 <nick2@xxxxxxxxxx>" -m fourth && + + echo five >>one && + git add one && + test_tick && + git commit --author "santa <me@xxxxxxxxxx>" -m fifth && + + echo six >>one && + git add one && + test_tick && + git commit --author "claus <me@xxxxxxxxxx>" -m sixth && + + echo seven >>one && + git add one && + test_tick && + git commit --author "CTO <cto@xxxxxxxxxxx>" -m seventh ' test_expect_success 'check-mailmap no arguments' ' @@ -276,31 +302,6 @@ Some Dude <some@xxxxxxx> (1): EOF test_expect_success 'Shortlog output (complex mapping)' ' - echo three >>one && - git add one && - test_tick && - git commit --author "nick2 <bugs@xxxxxxxxxx>" -m third && - - echo four >>one && - git add one && - test_tick && - git commit --author "nick2 <nick2@xxxxxxxxxx>" -m fourth && - - echo five >>one && - git add one && - test_tick && - git commit --author "santa <me@xxxxxxxxxx>" -m fifth && - - echo six >>one && - git add one && - test_tick && - git commit --author "claus <me@xxxxxxxxxx>" -m sixth && - - echo seven >>one && - git add one && - test_tick && - git commit --author "CTO <cto@xxxxxxxxxxx>" -m seventh && - mkdir -p internal_mailmap && echo "Committed <committer@xxxxxxxxxxx>" > internal_mailmap/.mailmap && echo "<cto@xxxxxxxxxx> <cto@xxxxxxxxxxx>" >> internal_mailmap/.mailmap && -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html