git_conflicts issue since zplug 2.3.1 about geometry HOT 15 CLOSED

Seems to be fully functional, just pointing it out incase it's a symptom of something bigger.

from geometry.

Looking further it seems you have to have at least two merge conflicts during a rebase.

Issue I'm facing though is here it's failing to determine total:

▲ ~ echo $conflicts
README.md
source.c

▲ ~ grep -c '^======$' $conflicts
grep: README.md
source.c: No such file or directory

▲ ~ grep -c '^======$' README.md source.c
README.md:0
source.c:0

from geometry.

Try

• Loading geometry theme without zplug loaded
• Loading zplug with other theme (with git integration - say agnoster)

With that information you'll have an idea where the issue is.

from geometry.

The prompt_geometry_git_conflicts:[:10: integer expression expected: 1\n1 has happened to me previously, so I'll look into it when I can reproduce it. If you want to open a different issue, I'd really appreciate it.

The zplug thing, would you be able to try what @desyncr said?

from geometry.

I switched over to antibody and all issues seem to have been cleared up!

from geometry.

Spoke too soon. It just popped up again during a git rebase.

I am now using an identical setup to your antibody one, @frmendes.

from geometry.

Is it working with antibody?

from geometry.

The theme and zsh works flawlessly, other than the git conflict warning posted above appearing during rebases.

from geometry.

Yea, I'll try to reproduce that. Happened to me during a rebase, but it doesn't happen consistently.

from geometry.

I am seeing the same issue with zplug version 2.2.0 I believe the issue was introduced with the with the recent timestamp prompt enhancement because checking out c8ec1b6 seems to have made the issue go away.

from geometry.

Just to note, I have this consistently on every rebase that has conflicts these days. I'm fully up to date with antibody and this theme.

from geometry.

I'll take a look into this later tonight.

from geometry.

Can't seem to be able to reproduce it.

from geometry.

I ran into this yesterday at work during multiple rebases. But it doesn't seem to happen everytime and I am not able to reproduce it consistently.

from geometry.

It's a bit worse than that because file_count=$(echo -n "$conflicts" | $GREP -c '^') returns different results for grep and ag.

 ▲ ~/Developer/geometry-test echo -n "$conflicts" | grep -c '^'
2

 ▲ ~/Developer/geometry-test echo -n "$conflicts" | ag -c '^'
1
1

from geometry.