[git-users] git bug reporting

2012-09-20 Thread maxhodges
anyone know where I can submit bugs in Git? Cheers, Max -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/5h4vOm_uvmcJ. To post to this group, send email

Re: [git-users] git bug reporting

2012-09-20 Thread Konstantin Khomoutov
On Thu, 20 Sep 2012 06:18:01 -0700 (PDT) maxhodges m...@whiterabbitpress.com wrote: anyone know where I can submit bugs in Git? Post to the main Git list which is git at vger.kernel.org See http://vger.kernel.org/vger-lists.html#git for more info. -- You received this message because you are

[git-users] Re: Problem getting mergetool (kdiff3) to work

2012-09-20 Thread EricP
Hi, I'm running windows 7 / 64 bits. Here's my version of Git: $ git --version git version 1.7.11.msysgit.1 I installed KDiff3 version 0.9.96. I don't have any error message when I launch the mergetool: when a conflict occurs during a merge, I use this command: $ git mergetool but no sign of

[git-users] Trying to write ref refs/heads/master with nonexistant object even though the object exists

2012-09-20 Thread Ramón Cahenzli
Hi all, I have an issue cloning a repository's master branch on any new machine. Machines that had an old clone of the same repository have no problem with the master branch. When cloning, I get the fatal error Trying to write ref refs/heads/master with nonexistant object

[git-users] Re: Trying to write ref refs/heads/master with nonexistant object even though the object exists

2012-09-20 Thread Ramón Cahenzli
After hours of debugging with the help of charon and canton7 on the Freenode #git channel, we found one solution for this: 1. The problem only happens on 1.7.2.5 and possibly earlier. Thus try to find 1.7.10.4 or newer somewhere. 2. Clone the repository on --bare format with 1.7.10.4:

[git-users] Re: Trying to write ref refs/heads/master with nonexistant object even though the object exists

2012-09-20 Thread Ramón Cahenzli
Some additional information in case this is relevant. It seems the problem is that the client is not requesting the master ref: https://gist.github.com/3757035 If you compare the outgoing traffic, you see that this line: 0032want aa293a2f2dd897c8fd8dabbe17417cc42bfdf4f5 Is only present for

[git-users] Re: Problem getting mergetool (kdiff3) to work

2012-09-20 Thread EricP
Seems like I have an answer... Today, kdiff3 was working when I needed to resolve merge conflicts, not working on others. Seems like there is merge resolution that is being handled by kdiff3 that Git could not go through. So the mergetool isn't only used for showing the conflicts and enabling