Elijah Newren writes:
>> I'd expect that a reader of the commit who cares enough to bother to
>> wonder by looking at the patch and seeing that 2 became 3 would know
>> why already. And a reader of the resulting file would not know that
>> the 3 used to be 2, and won't be
On Thu, May 24, 2018 at 6:17 PM, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
>>> -test 2 = $(git ls-files -s | wc -l) &&
>>> -test 2 = $(git ls-files -u | wc -l) &&
>>> -test 2 = $(git ls-files -o | wc -l) &&
>>
>>
On Thu, May 24, 2018 at 6:17 PM, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
>>> -test 2 = $(git ls-files -s | wc -l) &&
>>> -test 2 = $(git ls-files -u | wc -l) &&
>>> -test 2 = $(git ls-files -o | wc -l) &&
>>
>>
SZEDER Gábor writes:
>> -test 2 = $(git ls-files -s | wc -l) &&
>> -test 2 = $(git ls-files -u | wc -l) &&
>> -test 2 = $(git ls-files -o | wc -l) &&
>
> Here 'git ls-files -o' should have listed two untracked files ...
>
>> +
On Thu, May 24, 2018 at 3:05 AM, SZEDER Gábor wrote:
>> --- a/t/t6036-recursive-corner-cases.sh
>> +++ b/t/t6036-recursive-corner-cases.sh
>> @@ -65,9 +65,12 @@ test_expect_success 'merge simple rename+criss-cross with
>> no modifications' '
>>
>>
On Thu, May 24, 2018 at 12:05 PM, SZEDER Gábor wrote:
>
>> Signed-off-by: Elijah Newren
>> ---
>> t/t6036-recursive-corner-cases.sh| 102 ++-
>> t/t6042-merge-rename-corner-cases.sh | 99 +-
>> 2 files
> Signed-off-by: Elijah Newren
> ---
> t/t6036-recursive-corner-cases.sh| 102 ++-
> t/t6042-merge-rename-corner-cases.sh | 99 +-
> 2 files changed, 134 insertions(+), 67 deletions(-)
>
> diff --git
Signed-off-by: Elijah Newren
---
t/t6036-recursive-corner-cases.sh| 102 ++-
t/t6042-merge-rename-corner-cases.sh | 99 +-
2 files changed, 134 insertions(+), 67 deletions(-)
diff --git a/t/t6036-recursive-corner-cases.sh
8 matches
Mail list logo