Conflict+Staged counting

[arl]

@arl, hello again! Similar problem. Now the conflict is counted as staged. Instead I expect 11 staged, 1 conflicting and 1 untracked.

Demo

Raw output of command:

git status --porcelain --branch -z

git.txt

Originally posted by @iusmac in #61 (comment)

[arl]

@iusmac thank you
Did this already happen before or this is a regression due to #62 ?

(I went ahead and created a new issue for it anyway)

[iusmac]

@arl honestly, I can't remember because I'm not rebasing that much and even now most of the time gitmux shows correct values when rebasing. I noticed this wrong detection because now I simply pay more attention to it. I don't think that #62 has broken something. There's another case that is not detected. Check the git.txt file, the conflict is delimited by AA delimiter which is never mentioned in your parser and falls down to default: label which indeed counts staged files.

[arl]

Ok no worries. I'll have a look at it and let you know.

[arl]

@iusmac this, and other similar cases, should be fixed in latest release -> https://github.com/arl/gitmux/releases/latest
Thanks again for reporting and helping me to improve gitmux