git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Bug? - Unexpected lock file error

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 6, 2008, 00:09 UTC
Message-ID
<7vtzcut9s3.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<7v63paupd8.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 6 quoted lines
> "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.

Previous: Eric RaibleNext: Miklos Vajna
Message 4 of 7 in “Bug? - Unexpected lock file error”
  1. Eric RaibleSep 5, 2008
  2. Junio C HamanoSep 5, 2008
  3. Eric RaibleSep 6, 2008
  4. Junio C HamanoSep 6, 2008
  5. Miklos VajnaSep 6, 2008
  6. builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna, Sep 6, 2008
  7. Junio C HamanoSep 7, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.