Re: [PATCH v2] t4150: fix broken test for am --scissors

2018-08-07 Thread Paul Tan
On Tue, Aug 7, 2018 at 1:42 AM, Andrei Rybak wrote: > On 2018-08-06 10:58, Paul Tan wrote: >>> + git commit -F msg-without-scissors-line && >>> + git tag scissors-used && >> >> Nit: I'm not quite sure about naming the tag "scissors-used" though, >> since this commit was not created

Re: [PATCH v2] t4150: fix broken test for am --scissors

2018-08-06 Thread Andrei Rybak
On 2018-08-06 10:58, Paul Tan wrote: >> + git commit -F msg-without-scissors-line && >> + git tag scissors-used && > > Nit: I'm not quite sure about naming the tag "scissors-used" though, > since this commit was not created from the output of "git am > --scissors". Maybe it should be

Re: [PATCH v2] t4150: fix broken test for am --scissors

2018-08-06 Thread Junio C Hamano
Paul Tan writes: > I've taken a look at the original test, and it is pretty broken. My > ... > So, there are 3 problems that will need to be fixed. > ... > This fixes problem (3) by using an in-body header. > ... > This fixes the first half of problem (2) by making the naming of the > files the

Re: [PATCH v2] t4150: fix broken test for am --scissors

2018-08-06 Thread Paul Tan
Hi, I've taken a look at the original test, and it is pretty broken. My deepest apologies for this mess. On Sun, Aug 5, 2018 at 2:10 AM, Andrei Rybak wrote: > Tests for "git am --[no-]scissors" [1] work in the following way: > > 1. Create files with commit messages > 2. Use these files to

[PATCH v2] t4150: fix broken test for am --scissors

2018-08-04 Thread Andrei Rybak
Tests for "git am --[no-]scissors" [1] work in the following way: 1. Create files with commit messages 2. Use these files to create expected commits 3. Generate eml file with patch from expected commits 4. Create commits using git am with these eml files 5. Compare these commits with