Hi, list!

On Fri, Sep 5, 2008 at 8:53 AM, Shawn O. Pearce <[EMAIL PROTECTED]> wrote:

> git-gui: Fix diff parsing for lines starting with "--" or "++"

Somewhat related bug, but reproduceable event without "--". If I set
diff context to none in git gui (by repeatedly clicking "show less
context") I'm sometimes not able to stage hunk or line.

git version 1.6.0.GIT
git-gui version 0.11.GITGUI

Steps to reproduce:

[EMAIL PROTECTED]:~$ mkdir test
[EMAIL PROTECTED]:~$ cd test
[EMAIL PROTECTED]:~/test$ git init
Initialized empty Git repository in /home/agladysh/test/.git/
[EMAIL PROTECTED]:~/test$ cat >file.ext
-- 1
-- 2
-- 3
-- 4
-- 5
[EMAIL PROTECTED]:~/test$ git add file.ext
[EMAIL PROTECTED]:~/test$ git commit -m "one"
Created initial commit aa4da16: one
 1 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 file.ext
[EMAIL PROTECTED]:~/test$ cat >file.ext
-- 1
-- 2
-- 33
-- 4
-- 5
[EMAIL PROTECTED]:~/test$ git gui

Reduce context to none, then do stage hunk. It fails with message:

error: patch failed: file.ext:3
error: file.ext: patch does not apply
OK

Dump (by your debuging dumper patch from the same tread):

diff --git a/file.ext b/file.ext
--- a/file.ext
+++ b/file.ext
@@ -1,5 +1,5 @@
 -- 1
 -- 2
--- 3
+-- 33
 -- 4
 -- 5

Do stage line. It fails with message:

fatal: corrupt patch at line 5

Dump:

diff --git a/file.ext b/file.ext
--- a/file.ext
+++ b/file.ext
@@ -3 +3 @@
--- 3
+-- 33

HTH,
Alexander.

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to