#197 open
Pedro Melo

0.7 fails to commit, errors in Console.app

Reported by Pedro Melo | September 9th, 2009 @ 12:47 PM

Hi,

I've downloaded 0.7 today, and I'm using it with git version 1.6.5.rc0.

When I try the commit window, and stage some changes, the changes are not staged (I see the spinner in the left-bottom corner appear and disappear quickly, but nothing changes in the UI).

In the Console.app this starts to show (and keeps showing every 3 or 4 seconds, even after I close GitX)(I was mistaken, it stops after GitX exits):

9/9/09 11:44:28 AM GitX[75151] Error:
9/9/09 11:44:28 AM GitX[75151] Error:  
9/9/09 11:44:28 AM [0x0-0x3c73c7].nl.frim.GitX[75151] error: patch failed: sites/www.evolui.com/docs/cursos/curso_body.html:49 
9/9/09 11:44:28 AM [0x0-0x3c73c7].nl.frim.GitX[75151] error: sites/www.evolui.com/docs/cursos/curso_body.html: patch does not apply
9/9/09 11:19:31 AM GitX[74645] Window will close! 
9/9/09 11:19:31 AM [0x0-0x3b33b3].nl.frim.GitX[74645] fatal: Not a git repository (or any of the parent directories): .git

Any help I can give to sort this out?

Thanks in advance,

Comments and changes to this ticket

  • Johannes Gilger

    Johannes Gilger September 9th, 2009 @ 12:59 PM

    • State changed from “new” to “open”

    Yes, we're still having some problems with that. I guess the following is the case (please confirm or deny):

    1. You're staging using the stage-lines/stage-hunk buttons (and not staging file-wise) right?
    2. The hunk/lines you're staging contain some kind of weird characters, like umlauts, UTF-8 stuff, whatever (screenshot of the hunk would be nice).

    What's strange is that these message keep appearing after you close GitX

  • Pedro Melo

    Pedro Melo September 9th, 2009 @ 01:13 PM

    Hi,

    1. Yes, only when I use stage-hunk/stage-line buttons;
    2. This file is Latin1-encoded, and I can only notice the º used in there (http://www.simplicidade.org/share/gitx_commit_prob.png).

    Two extra points:

    1. please ignore the messages keep on appearing after GitX exits, I was mistaken;
    2. I had this error message with git gui before, but in this case, git gui works fine.

    Best regards,

  • Pieter de Bie

    Pieter de Bie September 9th, 2009 @ 01:23 PM

    Ah, that explains it then.

    I'll describe why this fails, but I think Johannes has already discovered this.

    When reading the patch, the stuff goes through PBEasyPipe. Then, on
    line 93, we try to convert the data to a usable NSString. This happens
    like this:

    NSString *string = [[NSString alloc] initWithData:data
    

    encoding:NSUTF8StringEncoding];

    if (!string)
        string = [[NSString alloc] initWithData:data
    

    encoding:NSISOLatin1StringEncoding];

    So, we first try to create a UTF8 string from it. If that fails, we
    try it as a Latin1 string. In your case, we cane the latin-1 string,
    because the º won't encode to UTF8 properly.

    This shouldn't be that much of a problem, until we try to apply the
    patch. Again this stuff goes through PBEasyPipe, but the data is
    written a bit higher in the code (line 86):

        [inHandle writeData:[input dataUsingEncoding:NSUTF8StringEncoding]];
    

    So, suddenly we write the º character as UTF8, instead of Latin-1.
    Git, having no clue about encodings at all, just sees a different byte
    sequence, and says the patch cannot be applied.

    So basically there are two problems here.

    1) GitX dumps the encoding information of the file. We should probably
    store that somewhere in the PBGitFile or whatever we use, to make sure
    we can restore it. We then have to extend PBEasyPipe to be able to
    output Latin-1 stuff.

    2) GitX doesn't report failed patches, so you don't have a clue that
    it didn't apply.

    Both shouldn't be that hard to fix, though the first is a bit
    annoying. I'm a bit tired of all the encoding madness :). The second
    especially should be easy to fix.

  • Pedro Melo

    Pedro Melo September 9th, 2009 @ 01:40 PM

    Forgive my complete noobness regarding Cocoa and GitX, but couldn't you just treat it all as a byte sequence, and convert to NSString only when you need to display it?

    Putting it another way: everything read from git and sent to git is treated as a binary blob, and only gets "upgraded" to a NSString for display purposes.

    Best regards,

  • Maria Breton

    Maria Breton February 18th, 2018 @ 09:38 PM

    Well, I guess this version is not updated, you must have the updated version of it and hopefully, the issue will be resolved. And I hope too that the information will be enough for you. Since I have discovered superior papers reviews with the same problem too.

  • Vincent

    Vincent February 19th, 2018 @ 03:25 PM

    Thanks Maria Breton. I had the same problem with my tech site

  • sdasfdf
  • showbox

    showbox June 20th, 2018 @ 10:39 AM

    Thank you for this. You can also stream your favorite movies and videos from showbox official site.

  • Ruth Elena

    Ruth Elena June 22nd, 2018 @ 07:03 AM

    I'm having the same issue, with Winston 0.7.2.
    I tested setTimeout and callback workaround without any success. Mobdro

  • galken

    galken June 24th, 2018 @ 05:47 AM

    color switch are among the best games of early 2018.

Please Sign in or create a free account to add a new ticket.

With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

GitX is the nice-looking gitk clone for OS X

Pages