From: "Eric Raible" <raible@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>, vmiklos@frugalware.org
Subject: Re: Bug? - Unexpected lock file error
Date: Fri, 5 Sep 2008 17:05:36 -0700 [thread overview]
Message-ID: <279b37b20809051705o1f00ac4fpfc085fe58fdf5133@mail.gmail.com> (raw)
In-Reply-To: <7v63paupd8.fsf@gitster.siamese.dyndns.org>
On Fri, Sep 5, 2008 at 4:47 PM, Junio C Hamano <gitster@pobox.com> wrote:
> "Eric Raible" <raible@gmail.com> writes:
>
>> If 'empty' has any commits then the merge happens as expected.
>
> I think it is a bug in the git-merge rewritten in C, in "Already
> uptodate!" codepath.
And the ""Already uptodate!" codepath isn't even triggered when we're up-to-date
but 'empty' has at even one actual commit. In that case we get a friendly
"Already up-to-date" and no fatal error.
next prev parent reply other threads:[~2008-09-06 0:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-05 23:22 Bug? - Unexpected lock file error Eric Raible
2008-09-05 23:47 ` Junio C Hamano
2008-09-06 0:05 ` Eric Raible [this message]
2008-09-06 0:09 ` Junio C Hamano
2008-09-06 2:12 ` Miklos Vajna
2008-09-06 16:29 ` [PATCH] builtin-merge: release the lockfile in try_merge_strategy() Miklos Vajna
2008-09-07 5:44 ` 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=279b37b20809051705o1f00ac4fpfc085fe58fdf5133@mail.gmail.com \
--to=raible@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vmiklos@frugalware.org \
/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