Re: [PATCH v4] reflog-walk: don't segfault on non-commit sha1's in the reflog
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jan 6, 2016, 01:28 UTC
- Message-ID
- <CAPig+cThSHKBiUk5CmtE59mci3JLMv7QPNfHZAYmkqQvZHHofA@mail.gmail.com>
- In-Reply-To
- <1452043212.5562.18.camel@kaarsemaker.net>
On Tue, Jan 5, 2016 at 8:20 PM, Dennis Kaarsemaker <dennis@kaarsemaker.net> wrote:
Show 26 quoted lines
> On di, 2016-01-05 at 20:05 -0500, Eric Sunshine wrote:
>> On Tue, Jan 5, 2016 at 4:12 PM, Dennis Kaarsemaker
>> > + git update-ref --create-reflog -m "Creating ref" \
>> > + refs/tests/tree-in-reflog HEAD &&
>> > + git update-ref -m "Forcing tree" refs/tests/tree-in-reflog
>> > HEAD^{tree} &&
>> > + git update-ref -m "Restoring to commit" refs/tests/tree-in
>> > -reflog HEAD &&
>> > + git reflog refs/tests/tree-in-reflog
>> > +'
>>
>> Hmm, this test is successful for me on OS X even without the
>> reflog-walk.c changes applied.
>>
>> > +test_expect_failure 'reflog with non-commit entries displays all
>> > entries' '
>> > + git reflog refs/tests/tree-in-reflog >actual &&
>> > + test_line_count = 3 actual
>> > +'
>>
>> And this test actually fails (inversely) because it's expecting a
>> failure, but doesn't get one since the command produces the expected
>> output.
>
> That's... surprising to say the least. What's the content of 'actual',
> and which git.git commit are you on?% cat t/trash\ directory.t1410-reflog/actual b60a214 refs/tests/tree-in-reflog@{0}: Restoring to commit 140c527 refs/tests/tree-in-reflog@{1}: Forcing tree b60a214 refs/tests/tree-in-reflog@{2}: Creating ref %
This is with only the t/t1410-reflog.sh changes from your patch applied atop current 'master' (SHA1 7548842).