On 2019-10-28 at 11:48:14, Vegard Nossum wrote: > Hi! > > Thanks for the feedback. > > I rebased on your branch and ran the tests without any problems. > > t5100 is fine for me -- the file above is only used for testing the mail > splitting algorithm, so the choice of hashing algorithm should be > irrelevant for the test. That's also why I chose to use a personal key > for the signature, the other tests also use pregenerated emails to avoid > testing the email generation in those tests. (It could be useful to > include those "historical" test cases, which should still work in case > the format ever changes again in the future.) Okay, great. Thanks for checking, since it looked like we might use the commit data in the buffer, but if this is only for mail splitting, then I agree there's no problem. > The other tests generate the commits/emails within the test. Are you > sure you resolved the conflict in t4150 correctly (i.e. leaving out the > gitattributes test at the end)? I may have misresolved it, but I've just rebased on master and the two versions of t4150 (master and my branch) are now identical, so hopefully I haven't regressed anything in my new version. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204