Merge branch 'jk/pager-per-command'

diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index f4f82c02379c7cf80251bb870cbb3b875e142db4..e818de6ddd904378265cb11f2d48075cda474f5f 100755 (executable)
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -4,6 +4,14 @@ test_description='.mailmap configurations'
 
 . ./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 '
        echo one >one &&
        git add one &&
@@ -106,7 +114,7 @@ test_expect_success 'name entry after email entry' '
        mkdir -p internal_mailmap &&
        echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
        echo "Internal Guy <bugs@company.xx>" >>internal_mailmap/.mailmap &&
-       git shortlog >actual &&
+       git shortlog HEAD >actual &&
        test_cmp expect actual
 '
 
@@ -123,7 +131,7 @@ test_expect_success 'name entry after email entry, case-insensitive' '
        mkdir -p internal_mailmap &&
        echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
        echo "Internal Guy <BUGS@Company.xx>" >>internal_mailmap/.mailmap &&
-       git shortlog >actual &&
+       git shortlog HEAD >actual &&
        test_cmp expect actual
 '
 
@@ -233,18 +241,18 @@ test_expect_success 'Log output (complex mapping)' '
 
 # git blame
 cat >expect <<\EOF
-^3a2fdcb (A U Thor     2005-04-07 15:13:13 -0700 1) one
-7de6f99b (Some Dude    2005-04-07 15:13:13 -0700 2) two
-5815879d (Other Author 2005-04-07 15:14:13 -0700 3) three
-ff859d96 (Other Author 2005-04-07 15:15:13 -0700 4) four
-5ab6d4fa (Santa Claus  2005-04-07 15:16:13 -0700 5) five
-38a42d8b (Santa Claus  2005-04-07 15:17:13 -0700 6) six
-8ddc0386 (CTO          2005-04-07 15:18:13 -0700 7) seven
+^OBJI (A U Thor     DATE 1) one
+OBJID (Some Dude    DATE 2) two
+OBJID (Other Author DATE 3) three
+OBJID (Other Author DATE 4) four
+OBJID (Santa Claus  DATE 5) five
+OBJID (Santa Claus  DATE 6) six
+OBJID (CTO          DATE 7) seven
 EOF
-
 test_expect_success 'Blame output (complex mapping)' '
        git blame one >actual &&
-       test_cmp expect actual
+       fuzz_blame actual >actual.fuzz &&
+       test_cmp expect actual.fuzz
 '
 
 test_done