undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4203 (mailmap): stop hardcoding commit ids and dates

Browse Source 
A seemingly innocuous change like adding test_tick somewhere can
completely upset the final mailmap test, since it checks commit
hashes and dates.  Make the test less fragile by fuzzing away the
unpredictable parts and leaving in the authors (which is what the
test is about, anyway).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-10-15 12:12:19 -05:00 committed by Junio C Hamano
parent d8d2eb7d6b
commit bfdfa3d414
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
t/t4203-mailmap.sh
View File

@ -4,6 +4,14 @@ test_description='.mailmap configurations'
. ./test-lib.sh . ./test-lib.sh
fuzz_blame () {
sed "
s/$_x05[0-9a-f][0-9a-f][0-9a-f]/OBJID/g
s/$_x05[0-9a-f][0-9a-f]/OBJI/g
s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
" "$@"
}
test_expect_success setup ' test_expect_success setup '
echo one >one && echo one >one &&
git add one && git add one &&
@ -233,18 +241,18 @@ test_expect_success 'Log output (complex mapping)' '
# git blame # git blame
cat >expect <<\EOF cat >expect <<\EOF
^3a2fdcb (A U Thor 2005-04-07 15:13:13 -0700 1) one ^OBJI (A U Thor DATE 1) one
7de6f99b (Some Dude 2005-04-07 15:13:13 -0700 2) two OBJID (Some Dude DATE 2) two
5815879d (Other Author 2005-04-07 15:14:13 -0700 3) three OBJID (Other Author DATE 3) three
ff859d96 (Other Author 2005-04-07 15:15:13 -0700 4) four OBJID (Other Author DATE 4) four
5ab6d4fa (Santa Claus 2005-04-07 15:16:13 -0700 5) five OBJID (Santa Claus DATE 5) five
38a42d8b (Santa Claus 2005-04-07 15:17:13 -0700 6) six OBJID (Santa Claus DATE 6) six
8ddc0386 (CTO 2005-04-07 15:18:13 -0700 7) seven OBJID (CTO DATE 7) seven
EOF EOF
test_expect_success 'Blame output (complex mapping)' ' test_expect_success 'Blame output (complex mapping)' '
git blame one >actual && git blame one >actual &&
test_cmp expect actual fuzz_blame actual >actual.fuzz &&
test_cmp expect actual.fuzz
' '
test_done test_done