Re: Multiple fetches when unshallowing a shallow clone

2015-12-05 Thread Jeff King
On Sat, Dec 05, 2015 at 08:00:28PM -0800, Junio C Hamano wrote: > > I suppose followtags feature has been around long enough that we can > > simply trust that and skip the second fetch? > > H, I wonder why the code needs the backfill fetch while talking > to a server that has the include-tag

Re: [PATCH 2/5] config.c: move worktree-specific variables to .git/worktrees/...

2015-12-05 Thread Eric Sunshine
On Wed, Dec 2, 2015 at 2:13 PM, Nguyễn Thái Ngọc Duy wrote: > .git/info/config.worktree is a pattern list that splits .git/config in > to sets: the worktree set matches the patterns, the commmon set does > not. > > In normal worktrees, both sets are stored in .git/config. The >

Re: Multiple fetches when unshallowing a shallow clone

2015-12-05 Thread Jeff King
On Sun, Dec 06, 2015 at 01:37:18AM -0500, Jeff King wrote: > And indeed, replacing the logic with what I wrote does make the backfill > go away in my test case. But it's so far from what is there that I feel > like I must be missing something. I think one thing I was missing is that we need to

Re: [RFC/PATCH 8/8] update-index: make core.untrackedCache a bool

2015-12-05 Thread Torsten Bögershausen
On 01.12.15 21:31, Christian Couder wrote: > Most features in Git can be enabled or disabled using a simple > bool config variable and it would be nice if untracked cache > behaved the same way. > > This makes --[no-|force-]untracked-cache change the value of > core.untrackedCache in the repo

[PATCH v2] revision.c: fix possible null pointer access

2015-12-05 Thread Stefan Naewe
mark_tree_uninteresting dereferences a tree pointer before checking if the pointer is valid. Fix that by doing the check first. Signed-off-by: Stefan Naewe --- revision.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/revision.c b/revision.c index

[PATCH 3/2] git.c: make sure we do not leak GIT_* to alias scripts

2015-12-05 Thread Nguyễn Thái Ngọc Duy
The unfortunate commit d95138e (setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR - 2015-06-26) exposes another problem, besides git-clone that's described in the previous commit. If GIT_WORK_TREE (or even GIT_DIR) is exported to an alias script, it may mislead git commands in the

Re: [PATCH 2/2] setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..

2015-12-05 Thread Duy Nguyen
On Thu, Dec 3, 2015 at 7:17 PM, Nguyễn Thái Ngọc Duy wrote: > The solution in d95138e is reverted in this commit. Instead we reuse the > solution from c056261 [4]. c056261 fixes another setup-messed-up-by-alias > by saving and restoring env for git-clone and git-init. Now I

[PATCH 1/2] git-p4: support multiple depot paths in p4 submit

2015-12-05 Thread Sam Hocevar
When submitting from a repository that was cloned using a client spec, use the full list of paths when ruling out files that are outside the view. This fixes a bug where only files pertaining to the first path would be included in the p4 submit. Signed-off-by: Sam Hocevar ---

[PATCH 2/2] git-p4: reduce number of server queries for fetches

2015-12-05 Thread Sam Hocevar
When fetching changes from a depot using a full client spec, there is no need to perform as many queries as there are top-level paths in the client spec. Instead we query all changes in chronological order, also getting rid of the need to sort the results and remove duplicates. Signed-off-by:

Draft of Git Rev News edition 10

2015-12-05 Thread Christian Couder
Hi, A draft of Git Rev News edition 10 is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-10.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Re: [PATCH] clean: new option --exclude-from

2015-12-05 Thread Junio C Hamano
Jeff King writes: > My motivation isn't exactly code sharing. It is that you sometimes want > to affect sub-commands of a program, and cannot pass command line > options to them yourself. > > For instance, "git-stash --include-untracked" will call "git clean" > under the hood.

Re: Multiple fetches when unshallowing a shallow clone

2015-12-05 Thread Junio C Hamano
Duy Nguyen writes: > On Fri, Dec 4, 2015 at 11:45 PM, Junio C Hamano wrote: > ... >> just like a regular fetch that auto-follows tags, where it has to >> make a second fetch if the primary fetch fails to include everything >> that is needed for propagating