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

On Thu, Apr 7, 2011 at 9:53 AM, Martin von Zweigbergk
[off-list ref] wrote:

On Wed, 6 Apr 2011, Mark Lodato wrote:

quoted

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.)