From: Miklos Vajna <vmiklos@frugalware.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Eric Raible <raible@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Bug? - Unexpected lock file error
Date: Sat, 6 Sep 2008 04:12:23 +0200 [thread overview]
Message-ID: <20080906021222.GY16514@genesis.frugalware.org> (raw)
In-Reply-To: <7vtzcut9s3.fsf@gitster.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
On Fri, Sep 05, 2008 at 05:09:32PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> > I think it is a bug in the git-merge rewritten in C, in "Already
> > uptodate!" codepath.
I can't reproduce it with master, so I don't think this problem was
introduced by the C rewrite.
> Try reverting 18668f5 (builtin-merge: avoid run_command_v_opt() for
> recursive and subtree, 2008-08-28). That patch seems to be seriously
> broken.
Yes, that works around the problem. I'll try to send a fix later today.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-09-06 2:13 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
2008-09-06 0:09 ` Junio C Hamano
2008-09-06 2:12 ` Miklos Vajna [this message]
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=20080906021222.GY16514@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=raible@gmail.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