{"thread":{"id":"14764","subject":"git citool/gui bug","startedAt":"2008-07-30T18:53:06Z","lastAt":"2008-07-31T03:23:37Z","messageCount":2,"participants":["Leandro Lucarella","Shawn O. Pearce"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"85666","messageId":"20080730185306.GV7616@integratech.com.ar","threadId":"14764","inReplyTo":null,"subject":"git citool/gui bug","fromName":"Leandro Lucarella","fromEmail":"llucarella@integratech.com.ar","sentAt":"2008-07-30T18:53:06Z","receivedAt":"2008-07-30T18:53:06Z","isPatch":false,"sender":{"key":"llucarella@integratech.com.ar","avatar":null},"body":"Hi! I think I've hit a really silly bug in citool/gui:\n\n1) mkdir test; cd test\n2) git init\n3) vi test.txt # add content\n4) cat test.txt\n\n===============\nHello World!!!!\n===============\n\n5) git citool\n6) add the test.txt file to the index\n7) see test.txt index diff\n\ngit citool shows:\n\nnew file mode 100644     # black\n@@ -0,0 +1,5 @@          # blue\n+                        # green\n ===============         # orange\n+Hello World!!!!         # green\n ===============         # orange\n+                        # green\n\n\nPlease Cc me, I'm not in the list.\n\nThank you!\n\n-- \nLeandro Lucarella\nIntegratech S.A.\n4571-5252\n"},{"id":"85722","messageId":"20080731032337.GA1860@spearce.org","threadId":"14764","inReplyTo":"20080730185306.GV7616@integratech.com.ar","subject":"Re: git citool/gui bug","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-07-31T03:23:37Z","receivedAt":"2008-07-31T03:23:37Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Leandro Lucarella <llucarella@integratech.com.ar> wrote:\n> Hi! I think I've hit a really silly bug in citool/gui:\n> \n> git citool shows:\n> \n> new file mode 100644     # black\n> @@ -0,0 +1,5 @@          # blue\n> +                        # green\n>  ===============         # orange\n> +Hello World!!!!         # green\n>  ===============         # orange\n> +                        # green\n\nHmph.  Don't put 7 = on a line together.  Or 7 < or 7 > for that\nmatter.  It confuses some git related tools like git-rerere,\nthe template pre-commit hook, and git-gui.\n\nIn this case we think these are the lines between two hunks in a\nmerge conflict, so we are showing them specially to you.  Just in\ncase you staged a conflicted hunk by accident during a merge you\nwant it to stand out to help you notice the error.\n\nYes, it would be nice if git-gui knew this wasn't actually a merge\nconflict but was instead proper text.  Sadly it isn't that smart.\n\n-- \nShawn.\n"}]}