From: Christoph Mallon <mallon@cs.uni-saarland.de>
To: Stefan Beller <sbeller@google.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: Bug in reflog of length 0x2BFF
Date: Mon, 01 Dec 2014 23:30:00 +0100 [thread overview]
Message-ID: <547CEBE8.8070301@cs.uni-saarland.de> (raw)
In-Reply-To: <CAGZ79kaLaWK57m9_1aFOkSubECUvFcEvGjid8EuUmYNUO5Z5jw@mail.gmail.com>
Am 01.12.14 19:53, schrieb Stefan Beller:
> So I am running a 3.13.0-40-generic x86_64 linux (so its's amd64) and
> git version 2.1.2
> and I cannot reproduce the bug you are describing. :(
):
I can reproduce it with
* OS X, i386 binary, git 2.2.0
* FreeBSD, amd64, git 2.1.0 and up (bisected it there)
* FreeBSD, amd64, git 2.1.2 (different machine)
I cannot reproduce it with
* Linux, amd64, git 2.1.0
> $ git rev-parse 'master@{52}'
> 0000000000000000000000000000000000000035
On a machine, where you see the bug, you get entry /0...036/.
This btw causes havoc:
git stash list shows all entries, but e.g. git stash drop drops the
wrong stash after @{52}.
> What I noticed though is there are 2 linefeeds at the end of each
> line, is that intended or did it break during transmission?
That broke.
It should be a normal reflog file.
Try this:
http://tron.yamagi.org/zeug/reflog.bad
Still 4207ed285f31ad3e04f08254237c0c1a1609642b seems a plausible cause,
because it's about reflogs.
Though I suspect the actual bug was introduced before, because this
commit only uses machinery, which was added earlier.
Christoph
next prev parent reply other threads:[~2014-12-01 22:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-01 15:15 Bug in reflog of length 0x2BFF Christoph Mallon
2014-12-01 16:00 ` Christoph Mallon
2014-12-01 18:53 ` Stefan Beller
2014-12-01 22:30 ` Christoph Mallon [this message]
2014-12-01 23:35 ` Jonathan Nieder
2014-12-02 1:39 ` Stefan Beller
2014-12-02 6:13 ` Christoph Mallon
2014-12-04 20:18 ` Junio C Hamano
2014-12-04 20:37 ` Christoph Mallon
2014-12-04 21:58 ` Jeff King
2014-12-04 22:14 ` Junio C Hamano
2014-12-05 1:28 ` [PATCH] for_each_reflog_ent_reverse: fix newlines on block boundaries Jeff King
2014-12-05 1:32 ` [PATCH] for_each_reflog_ent_reverse: turn leftover check into assertion Jeff King
2014-12-05 19:15 ` Junio C Hamano
2014-12-04 22:10 ` Bug in reflog of length 0x2BFF Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=547CEBE8.8070301@cs.uni-saarland.de \
--to=mallon@cs.uni-saarland.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).