Re: [PATCH] contrib/hooks: avoid requiring root access in usage instructions

2012-10-19 Thread Junio C Hamano
Jonathan Nieder writes: > Comments in hooks/post-receive-email suggest: > > For example, on debian the hook is stored in > /usr/share/git-core/contrib/hooks/post-receive-email: > > chmod a+x post-receive-email > cd /path/to/your/repository.git > ln -sf /usr/share/git-core/contrib/hooks/po

[PATCH] contrib/hooks: avoid requiring root access in usage instructions

2012-10-19 Thread Jonathan Nieder
Comments in hooks/post-receive-email suggest: For example, on debian the hook is stored in /usr/share/git-core/contrib/hooks/post-receive-email: chmod a+x post-receive-email cd /path/to/your/repository.git ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive Doi

Re: L10n regression in 1.8.0.rc2: diffstat summary (git diff --stat, git format-patch)

2012-10-19 Thread Peter Krefting
Nguyen Thai Ngoc Duy: It's the result of this discussion [1]. I don't remember exactly the open issues. But I think it involves drawing a line between team language vs local language, whether team language can be anything other than English, the maintenance cost for supporting it Like I said,

Re: libgit2 status

2012-10-19 Thread Junio C Hamano
Junio C Hamano writes: > Ramkumar Ramachandra writes: > >> Thiago Farina wrote: >>> [...] >>> With some structure like: >>> >>> include/git.h >>> src/git.c >>> >>> ... >>> >>> whatever. >>> [...] >> >> Junio- is it reasonable to expect the directory-restructuring by 2.0? > > I actually hate "inc

Re: Rebase doesn't restore branch pointer back on out of memory

2012-10-19 Thread Junio C Hamano
Alexander Kostikov writes: > Sorry to bother but I was wondering what would be the release version > that would have this patch. That depends on how well the people who are interested in this change test it to smoke out potential issues (if any) in it. It currently is on the 'pu' branch. -- To

Re: libgit2 status

2012-10-19 Thread dag
Junio C Hamano writes: > I actually hate "include/git.h vs src/git.c"; you have distinction > between .c and .h already. +1 -David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo inf

Re: [msysGit] Re: Git for Windows and line endings

2012-10-19 Thread John Szakmeister
On Fri, Oct 19, 2012 at 10:39 AM, Chris B wrote: [snip] > - Windows has been able to cope with UNIX line endings a long time; no > developer is using a default Notepad to open files with high > expectations. Any Windows development tool and editor worth anything > I've used is able to handle both

Re: Rebase doesn't restore branch pointer back on out of memory

2012-10-19 Thread Alexander Kostikov
Sorry to bother but I was wondering what would be the release version that would have this patch. -- Alexander On Wed, Oct 10, 2012 at 8:54 PM, Andrew Wong wrote: > > For the 'format-patch' part, originally I was going to do something like: > > git format-patch ... || { >

Re: [PATCH] Fix potential hang in https handshake.

2012-10-19 Thread Junio C Hamano
Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] Fix potential hang in https handshake.

2012-10-19 Thread szager
It has been observed that curl_multi_timeout may return a very long timeout value (e.g., 294 seconds and some usec) just before curl_multi_fdset returns no file descriptors for reading. The upshot is that select() will hang for a long time -- long enough for an https handshake to be dropped. The

Re: Fix potential hang in https handshake (v3)

2012-10-19 Thread Junio C Hamano
Jeff King writes: >> +if (max_fd < 0 && >> +select_timeout.tv_sec > 0 || >> +select_timeout.tv_usec > 5) { >> +select_timeout.tv_sec = 0; >> +select_timeout.tv_usec = 5

Re: Fix potential hang in https handshake (v3)

2012-10-19 Thread Jeff King
On Fri, Oct 19, 2012 at 02:04:20PM -0700, sza...@google.com wrote: > From 32e06128dbc97ceb0d060c88ec8db204fa51be5c Mon Sep 17 00:00:00 2001 > From: Stefan Zager > Date: Thu, 18 Oct 2012 16:23:53 -0700 Drop these lines. > Subject: [PATCH] Fix potential hang in https handshake. And make this one

Fix potential hang in https handshake (v3)

2012-10-19 Thread szager
>From 32e06128dbc97ceb0d060c88ec8db204fa51be5c Mon Sep 17 00:00:00 2001 From: Stefan Zager Date: Thu, 18 Oct 2012 16:23:53 -0700 Subject: [PATCH] Fix potential hang in https handshake. It has been observed that curl_multi_timeout may return a very long timeout value (e.g., 294 seconds and some us

What's cooking in git.git (Oct 2012, #06; Fri, 19)

2012-10-19 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The 1.8.0 release is expected to be tagged this weekend, after which I'd disappear for a few weeks, and Git will be in steady and good hands of

Re: [msysGit] Re: Git for Windows and line endings

2012-10-19 Thread Jeff King
On Fri, Oct 19, 2012 at 10:39:27AM -0400, Chris B wrote: > I would like to point out: > - Git on Linux does not mess around with line endings. I can create > and edit a file in either line ending on Linux and commit and still > have it untouched. > - Git on Windows via Cygwin also does not mess ar

[PATCH] diff: diff.context configuration gives default to -U

2012-10-19 Thread Jeff Muizelaar
Introduce a configuration variable diff.context that tells Porcelain commands to use a non-default number of context lines instead of 3 (the default). With this variable, users do not have to keep repeating "git log -U8" from the command line; instead, it becomes sufficient to say "git config diff

Re: Fix potential hang in https handshake.

2012-10-19 Thread Junio C Hamano
Jeff King writes: > On Fri, Oct 19, 2012 at 07:10:46AM -0700, Shawn O. Pearce wrote: > >> > IOW, it seems like we are _already_ following the advice referenced in >> > curl's manpage. Is there some case I am missing? Confused... >> >> The issue with the current code is sometimes when libcurl is

Re: Fix potential hang in https handshake.

2012-10-19 Thread Jeff King
On Fri, Oct 19, 2012 at 01:37:06PM -0700, Stefan Zager wrote: > > diff --git a/http.c b/http.c > > index df9bb71..cd07cdf 100644 > > --- a/http.c > > +++ b/http.c > > @@ -631,6 +631,19 @@ void run_active_slot(struct active_request_slot *slot) > > FD_ZERO(&excfds); > >

Re: Fix potential hang in https handshake.

2012-10-19 Thread Stefan Zager
On Fri, Oct 19, 2012 at 1:27 PM, Jeff King wrote: > > On Fri, Oct 19, 2012 at 07:10:46AM -0700, Shawn O. Pearce wrote: > > > > IOW, it seems like we are _already_ following the advice referenced in > > > curl's manpage. Is there some case I am missing? Confused... > > > > The issue with the curren

Re: Fix potential hang in https handshake.

2012-10-19 Thread Jeff King
On Fri, Oct 19, 2012 at 07:10:46AM -0700, Shawn O. Pearce wrote: > > IOW, it seems like we are _already_ following the advice referenced in > > curl's manpage. Is there some case I am missing? Confused... > > The issue with the current code is sometimes when libcurl is opening a > CONNECT style c

Re: libgit2 status

2012-10-19 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Thiago Farina wrote: >> [...] >> With some structure like: >> >> include/git.h >> src/git.c >> >> ... >> >> whatever. >> [...] > > Junio- is it reasonable to expect the directory-restructuring by 2.0? I actually hate "include/git.h vs src/git.c"; you have distincti

Re: A design for distributed submodules

2012-10-19 Thread Jens Lehmann
Am 19.10.2012 02:31, schrieb Lauri Alanko: > I think I finally agree that it's best to develop submodules further > rather than introduce a new tool for the functionality I require. Here > are some explicit proposals for submodules so we can at least establish > agreement on what should be done. Th

Re: [PATCH 6/6] format-patch --notes: show notes after three-dashes

2012-10-19 Thread Junio C Hamano
Junio C Hamano writes: > As long as what it does is explained in format-patch, that is fine. > > I do not think this deserves to be in the SubmittingPatches. We do > tell people to hide "here is the context of the change" additional > explanation after three dashes, but how the submitters prepar

Re: [PATCH] Cache stat_tracking_info() for faster status and branch -v

2012-10-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > stat_tracking_info() is used to calculated how many commits ahead or > behind for a branch. Rev walking can be slow especially when the > branch is way behind its remote end. By caching the results, we won't > have to rev walk every time we need these information.

Re: [msysGit] Re: Git for Windows and line endings

2012-10-19 Thread Junio C Hamano
Chris B writes: > - If there was SO MUCH thought into this, then it was too much... I do not have much to add to what area experts already said on bits specific to Git for Windows, but on just this part: > - Our builds were not breaking, it was production due to deployment > model utilizing Git

Re: Fix potential hang in https handshake.

2012-10-19 Thread Daniel Stenberg
On Fri, 19 Oct 2012, Shawn Pearce wrote: The issue with the current code is sometimes when libcurl is opening a CONNECT style connection through an HTTP proxy it returns a crazy high timeout (>240 seconds) and no fds. In this case Git waits forever. Is this repeatable with a recent libcurl? I

[PATCH] tree-walk: use enum interesting instead of integer

2012-10-19 Thread Nguyễn Thái Ngọc Duy
Commit d688cf0 (tree_entry_interesting(): give meaningful names to return values - 2011-10-24) converts most of the tree_entry_interesting values to the new enum, except "never_interesting". This completes the conversion. --- tree-walk.c | 8 1 file changed, 4 insertions(+), 4 deletions(-

Re: Fix potential hang in https handshake.

2012-10-19 Thread Junio C Hamano
Stefan Zager writes: > On Oct 19, 2012 7:11 AM, "Shawn Pearce" wrote: >> >> The issue with the current code is sometimes when libcurl is opening a >> CONNECT style connection through an HTTP proxy it returns a crazy high >> timeout (>240 seconds) and no fds. In this case Git waits forever. >> St

Re: Unexpected directories from read-tree

2012-10-19 Thread Uri Moszkowicz
I am using 1.8.0-rc2 but also tried 1.7.8.4. Thanks for the suggestion to use "ls-files -t" - that's exactly what I was looking for. With that I was easily able to tell what the problem is: missing "/" from the sparse-checkout file. On Thu, Oct 18, 2012 at 10:34 PM, Nguyen Thai Ngoc Duy wrote: >

Re: [msysGit] Re: Git for Windows and line endings

2012-10-19 Thread Chris B
Hi. I'm sorry about the tone of the email; I was writing it after spending a lot of energy fixing things up and I should have taken some time to breathe. I recognize this is likely not going to change and even if I could jump in to contribute it wouldn't matter. I also recognize that changing it n

Re: Fix potential hang in https handshake.

2012-10-19 Thread Shawn Pearce
On Fri, Oct 19, 2012 at 3:36 AM, Jeff King wrote: > On Thu, Oct 18, 2012 at 03:59:41PM -0700, Junio C Hamano wrote: > >> > It will sometimes happen that curl_multi_fdset() doesn't >> > return any file descriptors. In that case, it's recommended >> > that the application sleep for a short time bef

Re: [PATCH 0/2] gitk: fix --full-diff handling

2012-10-19 Thread Felipe Contreras
On Fri, Oct 19, 2012 at 3:12 PM, Johannes Sixt wrote: > Am 10/19/2012 12:56, schrieb Felipe Contreras: >> I find usel to do 'git log --full-duff -- file' to find out all the commits >> that touched the file, and show the full diff (not just the one of the file). >> >> Unfortunately gitk doesn't ho

[DOCBUG] git subtree synopsis needs updating

2012-10-19 Thread Yann Dirson
As the examples in git-subtree.txt show, the synopsis in the same file should surely get a patch along the lines of: -'git subtree' add -P +'git subtree' add -P Failure to specify the repository (by just specifying a local commit) fails with the cryptic: warning: read-tree: emptying t

Re: [PATCH 0/2] gitk: fix --full-diff handling

2012-10-19 Thread Johannes Sixt
Am 10/19/2012 12:56, schrieb Felipe Contreras: > I find usel to do 'git log --full-duff -- file' to find out all the commits > that touched the file, and show the full diff (not just the one of the file). > > Unfortunately gitk doesn't honour this option; the diff is limited in the UI. There is E

[PATCH 2/2] gitk: handle --full-diff correctly

2012-10-19 Thread Felipe Contreras
Otherwise the files are missing from the diff, and the list of files. Signed-off-by: Felipe Contreras --- gitk-git/gitk | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index b79dfdf..8109eed 100755 --- a/gitk-git/gitk +++ b/gitk-

[PATCH 1/2] gitk: simplify file filtering

2012-10-19 Thread Felipe Contreras
git diff is perfectly able to do this with '-- files', no need for manual filtering. Signed-off-by: Felipe Contreras --- gitk-git/gitk | 20 +++- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index d93bd99..b79dfdf 100755 --- a/gitk-

[PATCH 0/2] gitk: fix --full-diff handling

2012-10-19 Thread Felipe Contreras
Hi, I find usel to do 'git log --full-duff -- file' to find out all the commits that touched the file, and show the full diff (not just the one of the file). Unfortunately gitk doesn't honour this option; the diff is limited in the UI. The following patches fix that. Felipe Contreras (2): git

Re: Fix potential hang in https handshake.

2012-10-19 Thread Jeff King
On Thu, Oct 18, 2012 at 03:59:41PM -0700, Junio C Hamano wrote: > > It will sometimes happen that curl_multi_fdset() doesn't > > return any file descriptors. In that case, it's recommended > > that the application sleep for a short time before running > > curl_multi_perform() again. > > > > http: