From: Junio C Hamano <gitster@pobox.com>
To: "Eric Raible" <raible@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
Miklos Vajna <vmiklos@frugalware.org>
Subject: Re: Bug? - Unexpected lock file error
Date: Fri, 05 Sep 2008 17:09:32 -0700 [thread overview]
Message-ID: <7vtzcut9s3.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7v63paupd8.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Fri, 05 Sep 2008 16:47:31 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> "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.
Try reverting 18668f5 (builtin-merge: avoid run_command_v_opt() for
recursive and subtree, 2008-08-28). That patch seems to be seriously
broken.
next prev parent reply other threads:[~2008-09-06 0:11 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 [this message]
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=7vtzcut9s3.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=raible@gmail.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