Fix unmerged paths being double counted in status

There are a couple edge-cases that these basic regexes over the status
indicators might double count as different change stages.  These involve
the status symbols used for unmerged paths.

For instance, "DD $path" is printed for a conflicted file which has been
deleted by both sides of a merge.  However, "D" is a valid character for
both regular staged and unstaged file deletions.

Catch and filter out these problematic "unmerged path" cases by
replacing one of the duplicate characters in them with a "U".  Paths
will only ever contain a "U" on either side of their status if they are
in an unmerged state, and will thus prevent the staged/unstaged regexes
from matching them.  This solution works for git-sonar, since we don't
care to distinguish between AA/AU/UA or DD/DU/UD.  We simply report
whether any unmerged path involved an "addded" or "deleted" status on
either side, as opposed to more common "both modified (UU)" cases.

Signed-off-by: Matt Hunter <m@lfurio.us>

0 files changed, 0 insertions, 0 deletions