git citool/gui bug

Leandro Lucarella· Jul 30, 2008, 18:53 UTC · lore

Hi! I think I've hit a really silly bug in citool/gui:

1) mkdir test; cd test
2) git init
3) vi test.txt # add content
4) cat test.txt

=============== Hello World!!!! ===============

5) git citool
6) add the test.txt file to the index
7) see test.txt index diff

git citool shows:

new file mode 100644     # black

@@ -0,0 +1,5 @@          # blue
+                        # green
 ===============         # orange
+Hello World!!!!         # green
 ===============         # orange
+                        # green


Please Cc me, I'm not in the list.

Thank you!

-- 
Leandro Lucarella
Integratech S.A.
4571-5252

Shawn O. Pearce· Jul 31, 2008, 03:23 UTC · re: Leandro Lucarella · lore

Re: git citool/gui bug

Leandro Lucarella <llucarella@integratech.com.ar> wrote:

Show 11 quoted lines

> Hi! I think I've hit a really silly bug in citool/gui:
> 
> git citool shows:
> 
> new file mode 100644     # black
> @@ -0,0 +1,5 @@          # blue
> +                        # green
>  ===============         # orange
> +Hello World!!!!         # green
>  ===============         # orange
> +                        # green

Hmph. Don't put 7 = on a line together. Or 7 < or 7 > for that matter. It confuses some git related tools like git-rerere, the template pre-commit hook, and git-gui.

In this case we think these are the lines between two hunks in a merge conflict, so we are showing them specially to you. Just in case you staged a conflicted hunk by accident during a merge you want it to stand out to help you notice the error.

Yes, it would be nice if git-gui knew this wasn't actually a merge conflict but was instead proper text. Sadly it isn't that smart.

-- 
Shawn.