Re: Watchman support for git

2014-05-10 Thread Duy Nguyen
On Sat, May 3, 2014 at 6:14 AM, dtur...@twopensource.com wrote: The most sigificant patch uses Facebook's watchman daemon[1] to monitor the repository work tree for changes. This makes allows git status to avoid traversing the entire work tree to find changes. Some comments on this series. I

Git abuses qt4-ssh-askpass

2014-05-10 Thread Chris “Kwpolska” Warrick
Hello, when I’m using the HTTPS protocol to access repositories, a window from /usr/bin/qt4-ssh-askpass comes up. It asks for my “SSH pass phrase”, twice. Sadly, it’s wrong. The actual things it wants is the username in the first case, and the password used to access the remote repository (eg.

RE: Summary of the problems with git pull

2014-05-10 Thread Felipe Contreras
Felipe Contreras wrote: == git update == Another proposed solution is to have a new command: `git update`. This command would be similar to `git pull --ff-only` by default, but it could be configured to do merges instead, and when doing so in reverse. And here it is:

RE: Git abuses qt4-ssh-askpass

2014-05-10 Thread Felipe Contreras
Chris “Kwpolska” Warrick wrote: when I’m using the HTTPS protocol to access repositories, a window from /usr/bin/qt4-ssh-askpass comes up. It asks for my “SSH pass phrase”, twice. Sadly, it’s wrong. The actual things it wants is the username in the first case, and the password used to

Re: Output from git blame A..B -- path for the bottom commit is misleading

2014-05-10 Thread David Kastrup
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: On Fri, May 09, 2014 at 07:04:05AM +0200, David Kastrup wrote: Arguably if the user explicitly limited the range, he knows what he's looking at. Admittedly, I don't know offhand which options _will_ produce boundary

optimising a push by fetching objects from nearby repos

2014-05-10 Thread Sitaram Chamarty
Hi, Is there a trick to optimising a push by telling the receiver to pick up missing objects from some other repo on its own server, to cut down even more on network traffic? So, hypothetically, git push user@host:repo1 --look-for-objects-in=repo2 I'm aware of the alternates mechanism,

Re: Output from git blame A..B -- path for the bottom commit is misleading

2014-05-10 Thread Duy Nguyen
On Fri, May 9, 2014 at 12:04 PM, David Kastrup d...@gnu.org wrote: Jeff King p...@peff.net writes: I'd actually be inclined to say the opposite of what Junio is saying there: that -b should blank the author field as well as the commit sha1. I'd even go so far as to say that -b should probably

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread Duy Nguyen
On Sat, May 10, 2014 at 8:39 PM, Sitaram Chamarty sitar...@gmail.com wrote: Hi, Is there a trick to optimising a push by telling the receiver to pick up missing objects from some other repo on its own server, to cut down even more on network traffic? So, hypothetically, git push

Re: t5539 fails on ubuntu for v2.0.0-rc2

2014-05-10 Thread Jeff King
On Fri, May 09, 2014 at 02:08:27PM -0700, Junio C Hamano wrote: 3. Just disable the http tests when run as root. I think I'd favor 3. But I'd like to be sure that being root is the problem. I agree with both the conclusion and the precondition. Here's the patch. The problem starts

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread brian m. carlson
On Sat, May 10, 2014 at 07:09:37PM +0530, Sitaram Chamarty wrote: Hi, Is there a trick to optimising a push by telling the receiver to pick up missing objects from some other repo on its own server, to cut down even more on network traffic? So, hypothetically, git push

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread milki
On 17:23 Sat 10 May , brian m. carlson wrote: I don't believe this is possible. There has been some discussion on related matters at least fairly recently, though. Part of the reason nobody has implemented this is because it exposes additional security concerns. If I create a commit

Re: Watchman support for git

2014-05-10 Thread David Turner
On Sat, 2014-05-10 at 12:26 +0700, Duy Nguyen wrote: On Sat, May 3, 2014 at 6:14 AM, dtur...@twopensource.com wrote: The most sigificant patch uses Facebook's watchman daemon[1] to monitor the repository work tree for changes. This makes allows git status to avoid traversing the entire

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread brian m. carlson
On Sat, May 10, 2014 at 10:32:26AM -0700, milki wrote: On 17:23 Sat 10 May , brian m. carlson wrote: I don't believe this is possible. There has been some discussion on related matters at least fairly recently, though. Part of the reason nobody has implemented this is because it

Re: GIT, libcurl and GSS-Negotiate

2014-05-10 Thread brian m. carlson
On Mon, May 05, 2014 at 12:21:33PM +0200, Ivo Bellin Salarin wrote: Well, I'm on Windows. using `git version 1.9.2.msysgit.0`. You can find all the exchanges, recorded with wireshark, of the following usecases: * git vanilla (not working), * VisualStudio2013 with libgit (working) * curl

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread Junio C Hamano
Sitaram Chamarty sitar...@gmail.com writes: Is there a trick to optimising a push by telling the receiver to pick up missing objects from some other repo on its own server, to cut down even more on network traffic? So, hypothetically, git push user@host:repo1

Re: Watchman support for git

2014-05-10 Thread Duy Nguyen
On Sun, May 11, 2014 at 1:38 AM, David Turner dtur...@twopensource.com wrote: I got warning: Watchman watch error: Got bad JSON from watchman get-sockname: '[' or '{' expected near end of file. Any ideas what I did wrong? I'm using watchman.git and libwatchman.git. check-0.9.11 and jansson-2.4

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread Sitaram Chamarty
On 05/11/2014 02:32 AM, Junio C Hamano wrote: Sitaram Chamarty sitar...@gmail.com writes: Is there a trick to optimising a push by telling the receiver to pick up missing objects from some other repo on its own server, to cut down even more on network traffic? So, hypothetically, git

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread Storm-Olsen, Marius
On 5/10/2014 8:04 PM, Sitaram Chamarty wrote: On 05/11/2014 02:32 AM, Junio C Hamano wrote: That's an interesting thread and it's recent too. However, it's about clone (though the intro email mentions other commands also). I'm specifically interested in push efficiency right now. When you

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread Sitaram Chamarty
On 05/11/2014 07:04 AM, Storm-Olsen, Marius wrote: On 5/10/2014 8:04 PM, Sitaram Chamarty wrote: On 05/11/2014 02:32 AM, Junio C Hamano wrote: That's an interesting thread and it's recent too. However, it's about clone (though the intro email mentions other commands also). I'm specifically

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread Storm-Olsen, Marius
On 5/10/2014 9:10 PM, Sitaram Chamarty wrote: On 05/11/2014 07:04 AM, Storm-Olsen, Marius wrote: On 5/10/2014 8:04 PM, Sitaram Chamarty wrote: Many of the Git repo managers will neatly set up a server-side repo clone for you, with alternates into the original repo saving both network and disk

Re: optimising a push by fetching objects from nearby repos

2014-05-10 Thread Sitaram Chamarty
On 05/11/2014 08:41 AM, Storm-Olsen, Marius wrote: On 5/10/2014 9:10 PM, Sitaram Chamarty wrote: 1. Clone remote repo 2. Hack hack hack 3. Fork repo on server 4. Push changes to your own remote repo is equally efficient. Your suggestions are good for a manual setup where