Re: [PATCHv2] builtin/clone: support submodule groups

2015-11-30 Thread Michael J Gruber
Stefan Beller venit, vidit, dixit 30.11.2015 20:31: > + cc Duy, Michael, who discussed the sparse checkout recently > > On Wed, Nov 25, 2015 at 9:00 PM, Trevor Saunders > wrote: >> Seeing the recent sparse checkout discussion I realized it might be >> useful to have a similar sort of feature for

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-30 Thread Torsten Bögershausen
On 11/30/2015 08:05 PM, Junio C Hamano wrote: Ævar Arnfjörð Bjarmason writes: Maybe I'm missing some really common breakage with st_mtime on some system, but having a feature the user explicitly enables turn itself off and doing FS-testing that takes 10 seconds when it's enabled seems like the

rebase -X subtree

2015-11-30 Thread David A. Greene
Hi, I had a particular notion of what rebase -X subtree would do but I am apparently mistaken. What should be the result of the script below? I expected commits to be replayed on top of master with their trees adjusted to move files into a "files" directory. In the first case, the rebase seems

Re: arbitrary memory allocation

2015-11-30 Thread Stefan Beller
On Mon, Nov 30, 2015 at 4:17 PM, Junio C Hamano wrote: > ytr...@sdf-eu.org writes: > >> line_list="0032want "+obj[1][:40]+'\n' >> while len(line_list)<65430: # Get the ideal tcp packet size for fastest >> bandwidth (64Ko) >> for i in obj: >> if (i==obj[0]) or (i==obj[1]) or ("

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-30 Thread Stefan Beller
On Mon, Nov 30, 2015 at 10:11 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> +cc Junio, Duy >> >> So cloning from an arbitrary SHA1 is not a new thing I just came up with, >> but has been discussed before[1]. >> >> Junio wrote on Oct 09, 2014: >>> This is so non-standard a thing to do tha

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-30 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 18, 2015 at 10:56:02AM +0100, Johannes Schindelin wrote: > >> > For me I use this command more as a post-fetch: >> > >> > git fetch --all --prune && git-ff-refs >> > >> > I imagine that the big difference is in the number of branches that I >> > maintain, and per

Re: arbitrary memory allocation

2015-11-30 Thread Junio C Hamano
ytr...@sdf-eu.org writes: > line_list="0032want "+obj[1][:40]+'\n' > while len(line_list)<65430: # Get the ideal tcp packet size for fastest > bandwidth (64Ko) > for i in obj: > if (i==obj[0]) or (i==obj[1]) or ("pull" in i): > continue > li

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-30 Thread Stefan Beller
On Wed, Nov 25, 2015 at 11:18 AM, Jens Lehmann wrote: >>> >>> Hmm, I doubt it makes much sense to add the --group option to "git >>> submodule init". I'd rather init all submodules and do the group >>> handling only in the "git submodule update" command. That way >>> upstream can change grouping l

Re: Detecting pushes originating from shallow clones?

2015-11-30 Thread Owen Jacobson
Owen Jacobson wrote: > Within the constraints that > > * we cannot control which version of Git our users have installed, and > * we run Git v1.9.1, obtained from the Ubuntu 14.04 LTS .deb repositories > > what can we do in an update/pre-receive hook to detect that an > incoming push originates

Re: Detecting pushes originating from shallow clones?

2015-11-30 Thread Junio C Hamano
Owen Jacobson writes: > Hi folks, > > Here at Heroku, we ingest code from users by supplying them with a > Git server they can `git push` into. Occasionally, users will > attempt to push to us from a shallow clone, which causes numerous > problems for us and, often, for our users (incomplete > re

[PATCH] verify_pack: do not ignore return value of verification function

2015-11-30 Thread David Turner
In verify_pack, a caller-supplied verification function is called. The function returns an int. If that return value is non-zero, verify_pack should fail. The only caller of verify_pack is in builtin/fsck.c, whose verify_fn returns a meaningful error code (which was then ignored). Now, fsck migh

Detecting pushes originating from shallow clones?

2015-11-30 Thread Owen Jacobson
Hi folks, Here at Heroku, we ingest code from users by supplying them with a Git server they can `git push` into. Occasionally, users will attempt to push to us from a shallow clone, which causes numerous problems for us and, often, for our users (incomplete repositories, gaps in history, faile

Re: Git clone fails during pre-commit hook due to GIT_WORK_TREE=. (regression 2.5 -> 2.6)

2015-11-30 Thread Junio C Hamano
Duy Nguyen writes: > I was wrong, GIT_WORK_TREE support was added in git-clone many years > ago in 20ccef4 (make git-clone GIT_WORK_TREE aware - 2007-07-06). So > my change accidentally triggers an (undocumented) feature. We could > add a hack to ignore GIT_WORK_TREE if GIT_DIR is set too, but I

Re: [PATCH v6] Add git-grep threads param

2015-11-30 Thread Duy Nguyen
I forgot.. On Wed, Nov 11, 2015 at 12:52 PM, Victor Leschuk wrote: > + else if (num_threads < 0) > + die("Invalid number of threads specified (%d)", num_threads); Please wrap this string with _() so it can be translated -- Duy -- To unsubscribe from this list: send the line

Multiple fetches when unshallowing a shallow clone

2015-11-30 Thread Jason Paller-Rzepka
Hi all, Would anyone be willing to help me understand some shallow-clone behavior? (I found a bug in Dulwich, and I'm looking for some context so I can determine how to fix it.) I learned that cgit sometimes performs two fetches for a `git fetch --unshallow`: one with depth 'infinity', and a sub

Re: [PATCHv2] builtin/clone: support submodule groups

2015-11-30 Thread Stefan Beller
+ cc Duy, Michael, who discussed the sparse checkout recently On Wed, Nov 25, 2015 at 9:00 PM, Trevor Saunders wrote: > Seeing the recent sparse checkout discussion I realized it might be > useful to have a similar sort of feature for sparse checkouts. So say I > had a mobile and desktop client

Re: [PATCH v6] Add git-grep threads param

2015-11-30 Thread Duy Nguyen
On Wed, Nov 11, 2015 at 12:52 PM, Victor Leschuk wrote: > "git grep" can now be configured (or told from the command line) > how many threads to use when searching in the working tree files. > > Changes to default behavior: number of threads now doesn't depend > on online_cpus(), e.g. if specif

Re: [PATCH v6] Add git-grep threads param

2015-11-30 Thread Eric Sunshine
On Mon, Nov 16, 2015 at 8:11 AM, Victor Leschuk wrote: > "git grep" can now be configured (or told from the command line) > how many threads to use when searching in the working tree files. > > Changes to default behavior: number of threads now doesn't depend > on online_cpus(), e.g. if specifi

Re: [PATCH 5/8] checkout(-index): do not checkout i-t-a entries

2015-11-30 Thread Junio C Hamano
Duy Nguyen writes: > Sorry for this waaay too late response, everything (of the series > nd/ita-cleanup) is addressed so far except this.. > > On Tue, Aug 25, 2015 at 10:36:52AM -0700, Junio C Hamano wrote: >> > diff --git a/builtin/checkout.c b/builtin/checkout.c >> > index e1403be..02889d4 1006

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-30 Thread Duy Nguyen
On Mon, Nov 30, 2015 at 8:05 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Maybe I'm missing some really common breakage with st_mtime on some >> system, but having a feature the user explicitly enables turn itself >> off and doing FS-testing that takes 10 seconds when it's ena

Re: [PATCH] push: add recurseSubmodules config option

2015-11-30 Thread Mike Crowe
On Monday 30 November 2015 at 10:31:26 -0800, Junio C Hamano wrote: > Mike Crowe writes: > > > diff --git a/builtin/push.c b/builtin/push.c > > index 3bda430..dfced74 100644 > > --- a/builtin/push.c > > +++ b/builtin/push.c > > @@ -9,6 +9,7 @@ > > #include "transport.h" > > #include "parse-opti

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-30 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Maybe I'm missing some really common breakage with st_mtime on some > system, but having a feature the user explicitly enables turn itself > off and doing FS-testing that takes 10 seconds when it's enabled seems > like the wrong default to me. > > We don't do it

Re: [PATCH v8] Add Travis CI support

2015-11-30 Thread Stefan Beller
On Sat, Nov 28, 2015 at 9:12 AM, Jeff King wrote: > On Fri, Nov 27, 2015 at 10:23:26AM +0100, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> diff to v7: >> * remove NO_GETTEXT patch and install gettext on OS X to compile with >> no additional flags (thanks Torsten) >> * fix P4

Re: Git clone fails during pre-commit hook due to GIT_WORK_TREE=. (regression 2.5 -> 2.6)

2015-11-30 Thread Duy Nguyen
On Wed, Nov 25, 2015 at 9:13 PM, Duy Nguyen wrote: > On Tue, Nov 24, 2015 at 6:57 PM, Stefan Beller wrote: >> +to Nguyễn Thái Ngọc Duy >> >> On Mon, Nov 23, 2015 at 6:22 PM, Anthony Sottile wrote: >>> * Short description of the problem * >>> >>> It seems GIT_WORK_DIR is now exported invariantly

Re: [PATCH] push: add recurseSubmodules config option

2015-11-30 Thread Junio C Hamano
Mike Crowe writes: > diff --git a/builtin/push.c b/builtin/push.c > index 3bda430..dfced74 100644 > --- a/builtin/push.c > +++ b/builtin/push.c > @@ -9,6 +9,7 @@ > #include "transport.h" > #include "parse-options.h" > #include "submodule.h" > +#include "submodule-config.h" > #include "send-pa

Re: [RFC] rename detection: allow more renames

2015-11-30 Thread Junio C Hamano
Jeff King writes: > On Fri, Nov 13, 2015 at 05:35:06PM +0100, Andreas Krey wrote: > >> The code talks about limiting the size >> of the rename matrix, but as far as I >> can see, the matrix itself never exists >> as such, and the only thing that could >> actually overflow is the computation >> fo

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-30 Thread Junio C Hamano
Stefan Beller writes: > +cc Junio, Duy > > So cloning from an arbitrary SHA1 is not a new thing I just came up with, > but has been discussed before[1]. > > Junio wrote on Oct 09, 2014: >> This is so non-standard a thing to do that I doubt it is worth >> supporting with "git clone". "git clone -

Re: [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

2015-11-30 Thread SZEDER Gábor
Quoting Jeff King : On Tue, Nov 24, 2015 at 03:45:45PM +0100, SZEDER Gábor wrote: git-sh-setup's require_clean_work_tree() always exits with error on an orphan branch, even when the index and worktree are both clean. The reason is that require_clean_work_tree() starts off with verifying HEAD

Re: [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

2015-11-30 Thread SZEDER Gábor
Quoting Johannes Sixt : --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -200,7 +200,19 @@ require_work_tree () { } require_clean_work_tree () { - git rev-parse --verify HEAD >/dev/null || exit 1 + if git rev-parse --verify HEAD >/dev/null 2>/dev/null + then + com

[PATCH] Make error message after failing commit_lock_file() less confusing

2015-11-30 Thread SZEDER Gábor
The error message after a failing commit_lock_file() call sometimes looks like this, causing confusion: $ git remote add remote g...@server.com/repo.git error: could not commit config file .git/config # Huh?! # I didn't want to commit anything, especially not my config file! While in the

RE: [PATCH v6] Add git-grep threads param

2015-11-30 Thread Victor Leschuk
Hello all, does anybody have time to review this patch? PS Sorry for bothering =) -- Best Regards, Victor From: Victor Leschuk [vlesc...@gmail.com] Sent: Wednesday, November 11, 2015 03:52 To: git@vger.kernel.org Cc: Victor Leschuk Subject: [PATCH v6] Ad