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

Re: Bug report: git status does not report unmerged entries with copies

From
Mark Lodato <lodatom@gmail.com>
Date
Apr 7, 2011, 23:36 UTC
Message-ID
<BANLkTim6Bn6WQrYCrfmw+B_by-PiSuu-9Q@mail.gmail.com>
In-Reply-To
<alpine.DEB.2.00.1104070948310.25447@debian>

On Thu, Apr 7, 2011 at 9:53 AM, Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> wrote:

Show 14 quoted lines
>
> On Wed, 6 Apr 2011, Mark Lodato wrote:
>
>> Commit 4d4d572, "status: show worktree status of conflicted paths
>> separately" introduced the following bug:  If one tries to merge two
>> branches with a conflict, where the conflicting file was also copied
>> in one of the branches, "git status" (but not "git status -sb" or
>> git-gui) fails to report the unmerged status.
>
> I sent a patch for this not so long ago [1]. It is currently in "next"
> as commit d7c9bf2. I think Junio said the plan is to release it in
> 1.7.5.
>
>  [1] http://thread.gmane.org/gmane.comp.version-control.git/169289/focus=169887

Ah yes, sorry. Your commit does fix the problem. My test script reports a failure, but it is only because my grep command was insufficient to properly test. (At the very least, I should have check case insensitively.)

Previous: Martin von Zweigbergk
Message 3 of 3 in “Bug report: git status does not report unmerged entries with copies”
  1. Mark LodatoApr 7, 2011
  2. Martin von ZweigbergkApr 7, 2011
  3. Mark LodatoApr 7, 2011

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.