From: Mark Lodato <lodatom@gmail.com>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: git list <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: Bug report: git status does not report unmerged entries with copies
Date: Thu, 7 Apr 2011 19:36:09 -0400 [thread overview]
Message-ID: <BANLkTim6Bn6WQrYCrfmw+B_by-PiSuu-9Q@mail.gmail.com> (raw)
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:
>
> 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.)
prev parent reply other threads:[~2011-04-07 23:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-07 0:34 Bug report: git status does not report unmerged entries with copies Mark Lodato
2011-04-07 13:53 ` Martin von Zweigbergk
2011-04-07 23:36 ` Mark Lodato [this message]
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=BANLkTim6Bn6WQrYCrfmw+B_by-PiSuu-9Q@mail.gmail.com \
--to=lodatom@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.