Re: [PATCH v1] convert: add "status=delayed" to filter process protocol

2017-01-10 Thread Taylor Blau
h delayed items into groups. In particular, if the batch size is `N`, and Git sends `2N-1` items, the second batch will be under-filled. The filter on the other end needs some mechanism to send the second batch, even though it hasn't hit max capacity. Specifically, this is how Git LFS implements object transfers for data it does not have locally, but I'm sure that this sort of functionality would be useful for other filter implementations as well. -- Thanks, Taylor Blau ttayl...@github.com

Re: [PATCH v1] convert: add "status=delayed" to filter process protocol

2017-01-11 Thread Taylor Blau
ll items in the checkout by the point I see Git ask for the status of an item more than once", then Git _cannot_ ask for the status of a delayed item while there are still more items to checkout. This could be OK, so long as the protocol commits to it and documents this behavior. What are your thoughts? -- Thanks, Taylor Blau ttayl...@github.com

Re: [PATCH 3/3] replace: fix --graft when passing a tag

2019-03-28 Thread Taylor Blau
f the test instead: test_when_finished "git replace -d $HASH7" But I think your choice here is much better, since you need to delete the replacement a few lines above, too. I think it would be jarring to have both the inline `git replace -d`, and another from `test_when_finished`, so this makes much more sense. > +' > + > test_expect_success GPG 'set up a signed commit' ' > echo "line 17" >>hello && > echo "line 18" >>hello && > -- > 2.21.0.68.gd997bba285.dirty > The previous two look good as well. Reviewed-by: Taylor Blau Thanks, Taylor

Re: Feature request: Add --no-edit to git tag command

2019-04-03 Thread Taylor Blau
Hi Peff, On Wed, Apr 03, 2019 at 09:57:44PM -0400, Jeff King wrote: > On Wed, Apr 03, 2019 at 09:38:02AM -0500, Robert Dailey wrote: > > > Similar to git commit, it would be nice to have a --no-edit option for > > git tag. Use case is when I force-recreate a tag: > > > > $ git tag -af 1.0 123abc >

[PATCH 7/7] rev-list: detect broken root trees

2019-04-04 Thread Taylor Blau
From: Jeff King When the traversal machinery sees a commit without a root tree, it assumes that the tree was part of a BOUNDARY commit, and quietly ignores the tree. But it could also be caused by a commit whose root tree is broken or missing. Instead, let's die() when we see a NULL root tree. W

[PATCH 6/7] rev-list: let traversal die when --missing is not in use

2019-04-04 Thread Taylor Blau
From: Jeff King Commit 7c0fe330d5 (rev-list: handle missing tree objects properly, 2018-10-05) taught the traversal machinery used by git-rev-list to ignore missing trees, so that rev-list could handle them itself. However, it does so only by checking via oid_object_info_extended() that the obje

[PATCH 0/7] harden unexpected object types checks

2019-04-04 Thread Taylor Blau
raversal die when --missing is not in use rev-list: detect broken root trees Taylor Blau (4): t: move 'hex2oct' into test-lib-functions.sh t: introduce tests for unexpected object types list-objects.c: handle unexpected non-blob entries list-objects.c: handle unexpected non-tr

[PATCH 3/7] list-objects.c: handle unexpected non-blob entries

2019-04-04 Thread Taylor Blau
g immediately before attempting to dereference the result. Signed-off-by: Taylor Blau --- list-objects.c | 5 + t/t6102-rev-list-unexpected-objects.sh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/list-objects.c b/list-objects.c index dc77361e11..ea0

[PATCH 2/7] t: introduce tests for unexpected object types

2019-04-04 Thread Taylor Blau
the object referenced as another type, in which case we'd get NULL - we call lookup_tree() successfully, but when we try to read the object, we find out it's something else. We should check that we behave sensibly in both cases (especially because it is easy for a malicious actor

[PATCH 1/7] t: move 'hex2oct' into test-lib-functions.sh

2019-04-04 Thread Taylor Blau
laces throughout 't'. Move the definition to test-lib-function.sh, so that it can be used in new test suites, and its definition is not redundant. This will likewise make our job easier in the subsequent commit, which also uses 'hex2oct'. Signed-off-by: Taylor Blau ---

[PATCH 4/7] list-objects.c: handle unexpected non-tree entries

2019-04-04 Thread Taylor Blau
Apply similar treatment as the previous commit for non-tree entries, too. Signed-off-by: Taylor Blau --- list-objects.c | 5 + t/t6102-rev-list-unexpected-objects.sh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/list-objects.c b/list

[PATCH 5/7] get_commit_tree(): return NULL for broken tree

2019-04-04 Thread Taylor Blau
2018-04-06) Co-authored-by: Taylor Blau Signed-off-by: Taylor Blau Signed-off-by: Jeff King --- commit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commit.c b/commit.c index a5333c7ac6..e2cde566a9 100644 --- a/commit.c +++ b/commit.c @@ -345,10 +345,10 @@ str

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-05 Thread Taylor Blau
Hi Peff, On Fri, Apr 05, 2019 at 02:31:42PM -0400, Jeff King wrote: > On Thu, Apr 04, 2019 at 08:37:44PM -0700, Taylor Blau wrote: > > > Let A be the object referenced with an unexpected type, and B be the > > object doing the referencing. Do the following: > > &g

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-05 Thread Taylor Blau
On Fri, Apr 05, 2019 at 02:24:12PM -0400, Jeff King wrote: > On Fri, Apr 05, 2019 at 12:50:33PM +0200, SZEDER Gábor wrote: > > > > +test_expect_failure 'traverse unexpected non-tree entry (seen)' ' > > > + test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 > > > > This test saves

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-05 Thread Taylor Blau
On Fri, Apr 05, 2019 at 04:53:45PM -0400, Jeff King wrote: > On Fri, Apr 05, 2019 at 03:25:43PM -0400, Eric Sunshine wrote: > > > On Fri, Apr 5, 2019 at 2:24 PM Jeff King wrote: > > > On Fri, Apr 05, 2019 at 12:50:33PM +0200, SZEDER Gábor wrote: > > > > > + git cat-file commit $commit | > > > >

Re: [PATCH 6/7] rev-list: let traversal die when --missing is not in use

2019-04-05 Thread Taylor Blau
On Fri, Apr 05, 2019 at 02:41:11PM -0400, Jeff King wrote: > On Thu, Apr 04, 2019 at 08:37:54PM -0700, Taylor Blau wrote: > > > 3. have the traversal machinery communicate the failure to the caller, > > so that it can decide how to proceed without re-evaluting the obj

Re: [[GSoC][PATCH …]] In notes-merge.c updated notes_merge_commit()

2019-04-08 Thread Taylor Blau
Hi Thomas, On Sat, Apr 06, 2019 at 03:41:27PM +0100, Thomas Gummerer wrote: > > Subject: [[GSoC][PATCH …]] In notes-merge.c updated notes_merge_commit() > > Commit messages are usually in the format ": description>". So a better title might be "notes-merge: use > dir-iterator in notes_merge_comm

Re: [RFC] TODO in read-cache.c

2019-04-08 Thread Taylor Blau
Hi Kapil, Welcome to Git! I am thrilled to see new faces on the mailing list. On Sat, Apr 06, 2019 at 05:43:56PM +0530, Kapil Jain wrote: > On Sat, Apr 6, 2019 at 5:33 PM Duy Nguyen wrote: > > > > trace2 API can already take 'struct repository' (the_repository is a > > pointer to 'struct reposit

Re: [PATCH][RFC] read-cache: read_index_from() accepts repo as arg

2019-04-08 Thread Taylor Blau
Hi Kapil, On Sun, Apr 07, 2019 at 01:07:12PM +0530, Kapil Jain wrote: > Signed-off-by: Kapil Jain > --- > > In read-cache, the read_index_from() function had a TODO task, > this patch completes that. There are some other functions in the same file > where this exact TODO needs to be done, will pr

Re: [PATCH 6/7] rev-list: let traversal die when --missing is not in use

2019-04-08 Thread Taylor Blau
Hi Peff, On Sun, Apr 07, 2019 at 09:41:13AM -0400, Jeff King wrote: > On Fri, Apr 05, 2019 at 10:36:48PM -0700, Taylor Blau wrote: > > > > > Of those, I think (3) is probably the best path forward. However, this > > > > patch does none of them. In the

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-08 Thread Taylor Blau
Hi Ævar, On Sun, Apr 07, 2019 at 11:00:19PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Apr 05 2019, Jeff King wrote: > > > On Fri, Apr 05, 2019 at 08:42:29PM +0200, SZEDER Gábor wrote: > > > >> > > Don't run git commands upstream of a pipe, because the pipe hides > >> > > their exit code.

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-08 Thread Taylor Blau
Hi Junio, On Mon, Apr 08, 2019 at 03:44:25PM +0900, Junio C Hamano wrote: > Eric Sunshine writes: > > > On Fri, Apr 5, 2019 at 2:24 PM Jeff King wrote: > >> On Fri, Apr 05, 2019 at 12:50:33PM +0200, SZEDER Gábor wrote: > >> > > + git cat-file commit $commit | > >> > > + perl -lpe "/

Re: [PATCH] Unbreak real_path on Windows for already absolute paths (with Visual Studio)

2019-04-08 Thread Taylor Blau
Hi Sven, On Mon, Apr 08, 2019 at 01:16:33PM +0200, Sven Strickroth wrote: > A path such as 'c:/somepath/submodule/../.git/modules/submodule' wasn't > resolved correctly any more, because the *nix variant of > offset_1st_component is used instead of the Win32 specific version. I'm not a win32 expe

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-08 Thread Taylor Blau
Hi Eric, On Mon, Apr 08, 2019 at 11:28:19PM -0400, Eric Sunshine wrote: > On Mon, Apr 8, 2019 at 10:31 PM Taylor Blau wrote: > > On Mon, Apr 08, 2019 at 03:44:25PM +0900, Junio C Hamano wrote: > > > Eric Sunshine writes: > > > >> &g

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-09 Thread Taylor Blau
Hi Eric, On Tue, Apr 09, 2019 at 04:02:23AM -0400, Eric Sunshine wrote: > On Tue, Apr 9, 2019 at 1:09 AM Taylor Blau wrote: > > On Mon, Apr 08, 2019 at 11:28:19PM -0400, Eric Sunshine wrote: > > > I suspect that Junio's "Looks good" was referring to the 'se

Re: [PATCH 2/7] t: introduce tests for unexpected object types

2019-04-09 Thread Taylor Blau
Hi Ævar, On Tue, Apr 09, 2019 at 11:14:48AM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Apr 09 2019, Taylor Blau wrote: > > > Hi Ævar, > > > > On Sun, Apr 07, 2019 at 11:00:19PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > >> On Fri, Apr 05 2019

[PATCH v2 7/7] rev-list: detect broken root trees

2019-04-09 Thread Taylor Blau
From: Jeff King When the traversal machinery sees a commit without a root tree, it assumes that the tree was part of a BOUNDARY commit, and quietly ignores the tree. But it could also be caused by a commit whose root tree is broken or missing. Instead, let's die() when we see a NULL root tree. W

[PATCH v2 1/7] t: move 'hex2oct' into test-lib-functions.sh

2019-04-09 Thread Taylor Blau
laces throughout 't'. Move the definition to test-lib-function.sh, so that it can be used in new test suites, and its definition is not redundant. This will likewise make our job easier in the subsequent commit, which also uses 'hex2oct'. Signed-off-by: Taylor Blau ---

[PATCH v2 6/7] rev-list: let traversal die when --missing is not in use

2019-04-09 Thread Taylor Blau
From: Jeff King Commit 7c0fe330d5 (rev-list: handle missing tree objects properly, 2018-10-05) taught the traversal machinery used by git-rev-list to ignore missing trees, so that rev-list could handle them itself. However, it does so only by checking via oid_object_info_extended() that the obje

[PATCH v2 2/7] t: introduce tests for unexpected object types

2019-04-09 Thread Taylor Blau
ould check that we behave sensibly in both cases (especially because it is easy for a malicious actor to provoke one case or the other). Co-authored-by: Jeff King Signed-off-by: Taylor Blau Signed-off-by: Jeff King --- t/t6102-rev-list-unexpected-objects.sh | 123 + 1 f

[PATCH v2 5/7] get_commit_tree(): return NULL for broken tree

2019-04-09 Thread Taylor Blau
2018-04-06) Co-authored-by: Taylor Blau Signed-off-by: Taylor Blau Signed-off-by: Jeff King --- commit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commit.c b/commit.c index a5333c7ac6..e2cde566a9 100644 --- a/commit.c +++ b/commit.c @@ -345,10 +345,10 @@ str

[PATCH v2 0/7] harden unexpected object types checks

2019-04-09 Thread Taylor Blau
when --missing is not in use rev-list: detect broken root trees Taylor Blau (4): t: move 'hex2oct' into test-lib-functions.sh t: introduce tests for unexpected object types list-objects.c: handle unexpected non-blob entries list-objects.c: handle unexpected non-tre

[PATCH v2 3/7] list-objects.c: handle unexpected non-blob entries

2019-04-09 Thread Taylor Blau
g immediately before attempting to dereference the result. Signed-off-by: Taylor Blau --- list-objects.c | 5 + t/t6102-rev-list-unexpected-objects.sh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/list-objects.c b/list-objects.c index dc77361e11..ea0

[PATCH v2 4/7] list-objects.c: handle unexpected non-tree entries

2019-04-09 Thread Taylor Blau
Apply similar treatment as the previous commit for non-tree entries, too. Signed-off-by: Taylor Blau --- list-objects.c | 5 + t/t6102-rev-list-unexpected-objects.sh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/list-objects.c b/list

Re: [PATCH 0/4] use xmalloc in more places

2019-04-11 Thread Taylor Blau
Hi Peff, On Thu, Apr 11, 2019 at 09:47:36AM -0400, Jeff King wrote: > It was reported on the Git security list that there are a few spots > which use a bare malloc() but don't check the return value, which could > dereference NULL. I don't think any of these are exploitable in an > interesting way

Re: [PATCH 0/4] use xmalloc in more places

2019-04-11 Thread Taylor Blau
Hi Peff, On Thu, Apr 11, 2019 at 03:37:35PM -0400, Jeff King wrote: > On Thu, Apr 11, 2019 at 12:14:52PM -0700, Taylor Blau wrote: > > > > This series cleans up most of the bare calls found by: > > > > > > git grep -E '[^a-z_](m|c|re)alloc\('

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-16 Thread Taylor Blau
Hi Junio, On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote: > * tb/unexpected (2019-04-10) 7 commits > - rev-list: detect broken root trees > - rev-list: let traversal die when --missing is not in use > - get_commit_tree(): return NULL for broken tree > - list-objects.c: handle u

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-16 Thread Taylor Blau
On Wed, Apr 17, 2019 at 02:38:34PM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > > Hi Junio, > > > > On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote: > >> * tb/unexpected (2019-04-10) 7 commits > >> ... > >> Code tig

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Taylor Blau
On Wed, Apr 17, 2019 at 03:14:28PM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > >> That's this one > >> > >> Date: Tue, 9 Apr 2019 19:13:06 -0700 (1 week, 3 hours, 23 minutes ago) > >> Subject: [PATCH v2 0/7] harden unexpected obje

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-04-25 Thread Taylor Blau
Hi Junio, On Thu, Apr 25, 2019 at 07:15:06PM +0900, Junio C Hamano wrote: > * tb/unexpected (2019-04-10) 7 commits > (merged to 'next' on 2019-04-25 at c49927fca0) > + rev-list: detect broken root trees > + rev-list: let traversal die when --missing is not in use > + get_commit_tree(): return

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-04-25 Thread Taylor Blau
On Fri, Apr 26, 2019 at 02:41:38PM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > > On Thu, Apr 25, 2019 at 07:15:06PM +0900, Junio C Hamano wrote: > >> * tb/unexpected (2019-04-10) 7 commits > >> (merged to 'next' on 2019-04-25 at c49927fca0) &g

Re: [PATCH] clang-format: use git grep to generate the ForEachMacros list

2019-06-05 Thread Taylor Blau
Hi Miguel, On Tue, Jun 04, 2019 at 12:48:14AM +0200, Miguel Ojeda wrote: > The ForEachMacros list can reasonably be generated grepping > the C source code for macros with 'for_each' in their name. > > Taken almost verbatim from the .clang-format file in the Linux kernel. > > Signed-off-by: Miguel

Re: Travis not looking so good

2019-06-26 Thread Taylor Blau
Hi Gábor, On Sun, Jun 02, 2019 at 01:22:39PM +0200, SZEDER Gábor wrote: > On Sat, Jun 01, 2019 at 12:41:43AM +, brian m. carlson wrote: > > On 2019-05-30 at 19:32:41, Johannes Schindelin wrote: > > > Hi Gábor, > > > > > > do you have any idea why Travis is failing like this in the macOS/gcc >

[PATCH 1/1] ref-filter.c: find disjoint pattern prefixes

2019-06-26 Thread Taylor Blau
eal0m5.805s user0m5.188s sys 0m0.468s to: real0m0.001s user0m0.000s sys 0m0.000s On linux.git, the times to dig out two of the latest -rc tags drops from 0.002s to 0.001s, so the change on repositories with fewer tags is much less noticeable. Co-author

[PATCH 0/1] ref-filter.c: faster multi-pattern ref filtering

2019-06-26 Thread Taylor Blau
but yields a drastic improvement on our fork network repositories. Some synthetic results are included in the patch as well. Thanks in advance for your review. Taylor Blau (1): ref-filter.c: find disjoint pattern prefixes ref-filter.c| 89 + t/t6300-

Re: [PATCH 1/1] ref-filter.c: find disjoint pattern prefixes

2019-07-01 Thread Taylor Blau
Hi Jacob, On Wed, Jun 26, 2019 at 05:37:42PM -0700, Jacob Keller wrote: > [ ... ] > > > Instead, we want to partition the patterns into disjoint sets, where we > > know that no ref will be matched by any two patterns in different sets. > > In the above, these are: > > > > - {'refs/heads/a/*', 'r

Re: [PATCH 1/1] ref-filter.c: find disjoint pattern prefixes

2019-07-01 Thread Taylor Blau
Hi Jacob, On Thu, Jun 27, 2019 at 04:21:57PM -0700, Jacob Keller wrote: > On Wed, Jun 26, 2019 at 3:44 PM Taylor Blau wrote: > > > > Ok, now I've got some time to look at the code itself. > > > ref-filter.c| 89 +

Re: What's cooking in git.git (Jun 2019, #07; Fri, 28)

2019-07-01 Thread Taylor Blau
Hi Junio, On Fri, Jun 28, 2019 at 03:17:42PM -0700, Junio C Hamano wrote: > * tb/ref-filter-multiple-patterns (2019-06-27) 1 commit > - ref-filter.c: find disjoint pattern prefixes > > "git for-each-ref" with multiple patterns have been optimized. > > Will merge to 'next'. Thanks for queueing

Re: What's cooking in git.git (Jun 2019, #07; Fri, 28)

2019-07-01 Thread Taylor Blau
On Fri, Jun 28, 2019 at 03:17:42PM -0700, Junio C Hamano wrote: > * jk/check-connected-with-alternates (2019-06-28) 1 commit > - check_connected: assume alternate ref tips are valid > > The tips of refs from the alternate object store can be used as > starting point for reachability computation

Re: [PATCH] check_everything_connected: assume alternate ref tips are valid

2019-07-01 Thread Taylor Blau
Hi Peff, On Mon, Jul 01, 2019 at 09:17:13AM -0400, Jeff King wrote: > On Mon, Jul 01, 2019 at 08:59:45AM -0400, Jeff King wrote: > > > Yes, this is weakening the ties of the feature to the transport code. > > Traditionally transport-oriented code was the only user, but it also > > used the upload-

Re: [PATCH 1/2] ci: don't update Homebrew

2019-07-09 Thread Taylor Blau
Hi Gábor, On Wed, Jul 03, 2019 at 12:47:47PM +0200, SZEDER Gábor wrote: > Lately our GCC macOS build job on Travis CI has been erroring out > while installing dependencies with: > > +brew link gcc@8 > Error: No such keg: /usr/local/Cellar/gcc@8 > The command "ci/install-dependencies.sh" fail

Re: [PATCH v3 0/3] [RFC] Create 'core.featureAdoptionRate' setting to update config defaults

2019-07-09 Thread Taylor Blau
Hi Derrick, I'm a little bit late to the part, but I think that this is a really interesting feature with a lot of really interesting discussion so far. I hope you don't mind me throwing in my $.02 as well :-). On Mon, Jul 08, 2019 at 03:22:49PM -0400, Derrick Stolee wrote: > On 7/1/2019 10:29 A

Alternates advertisement on GitHub

2019-07-25 Thread Taylor Blau
Hi everybody, Pushes to forks of git.git hosted on GitHub now advertise the tips of git.git as well as branches from your fork. You may recall that Peff and I have sent a handful of patches to allow repositories to customize how they gather references to advertise from an alternate, and then to u

Re: Alternates advertisement on GitHub

2019-07-26 Thread Taylor Blau
Hi Stolee, On Fri, Jul 26, 2019 at 09:18:50AM -0400, Derrick Stolee wrote: > On 7/25/2019 11:18 PM, Taylor Blau wrote: > > Hi everybody, > > > > Pushes to forks of git.git hosted on GitHub now advertise the tips of > > git.git as well as branches from your fork. >

[PATCH] Documentation/config.txt: fix typo in core.alternateRefsCommand

2018-10-22 Thread Taylor Blau
ansport.c: introduce core.alternateRefsCommand, 2018-10-08) Signed-off-by: Taylor Blau --- Note: this can be applied as a fixup to the commit [1] mentioned above. I'm sending it as a separate series, since the patches have already landed on 'next'.

Re: What's cooking in git.git (Oct 2018, #05; Fri, 26)

2018-10-26 Thread Taylor Blau
On Fri, Oct 26, 2018 at 04:57:26PM +0900, Junio C Hamano wrote: > * tb/filter-alternate-refs (2018-10-25) 2 commits > (merged to 'next' on 2018-10-26 at 887a7779a3) > + t5410: use longer path for sample script > + Documentation/config.txt: fix typo in core.alternateRefsCommand > > Test fix. >

Re: [PATCH] t3701-add-interactive: tighten the check of trace output

2018-09-10 Thread Taylor Blau
> Tighten this 'grep' pattern to only match trace lines that show the > executed commands. Looks good, and I think that this is the only such occurrence in t3701 that needs this treatment. Signed-off-by: Taylor Blau

Re: Fwd: spelling mistake 'rerere' on docs/git-gc

2018-09-14 Thread Taylor Blau
Hi Mikkel, On Fri, Sep 14, 2018 at 02:31:04PM +0200, Mikkel Hofstedt Juul wrote: > See title > in sentence: > ...invocations of git add, packing refs, pruning reflog, rerere > metadata or stale working trees. I think that 'rerere' in this case, is correct, since it refers bookkeeping from the 'gi

Re: v2.19.0 Git install doesn't allow VS Code as an editor

2018-09-14 Thread Taylor Blau
Hi Zachary, On Fri, Sep 14, 2018 at 09:43:43AM -0500, Zachary Bryant wrote: > When the installer asks for a default editor, it defaults to vim and > when I select either VS Code option, it won't allow me to proceed. It sounds like this is an issue pertaining to Git for Windows, which uses an issu

Re: Git for games working group

2018-09-14 Thread Taylor Blau
Hi John, On Fri, Sep 14, 2018 at 10:55:39AM -0700, John Austin wrote: > Is anyone interested in contributing/offering insights? I suspect most > folks here are git users as is, but if you know someone stuck on > Perforce, I'd love to chat with them! I'm thrilled that other folks are interested in

Re: Git for games working group

2018-09-15 Thread Taylor Blau
On Fri, Sep 14, 2018 at 02:09:12PM -0700, John Austin wrote: > I've been working myself on strategies for handling binary conflicts, > and particularly how to do it in a git-friendly way (ie. avoiding as > much centralization as possible and playing into the commit/branching > model of git). Git L

Re: Git for games working group

2018-09-15 Thread Taylor Blau
On Fri, Sep 14, 2018 at 04:36:19PM -0700, John Austin wrote: > > There's also the nascent "don't fetch all the blobs" work-in-progress > > clone mode which might be of interest to you: > > https://blog.github.com/2018-09-10-highlights-from-git-2-19/#partial-clones > > Yes! I've been pretty excited

Re: Git for games working group

2018-09-17 Thread Taylor Blau
On Sun, Sep 16, 2018 at 12:56:04AM -0700, David Aguilar wrote: > Combining changes is inherently file-format specific, and I suspect > that native authoring tools are best used in those scenarios. > Maybe LFS can help deal with binary conflicts by having short and sweet > ways to grab the "base", "

Re: Git for games working group

2018-09-17 Thread Taylor Blau
On Sun, Sep 16, 2018 at 04:55:13PM +0200, Ævar Arnfjörð Bjarmason wrote: > In the hypothetical git-annex-like case (simplifying a bit for the > purposes this explanation), for every FILE in your tree you have a > corresponding FILE.lock file, but it's not a boolean, but a log of who's > asked for l

Re: Git for games working group

2018-09-17 Thread Taylor Blau
On Sun, Sep 16, 2018 at 03:05:48PM -0700, Jonathan Nieder wrote: > Hi, > > On Sun, Sep 16, 2018 at 11:17:27AM -0700, John Austin wrote: > > Taylor Blau wrote: > > >> Right, though this still subjects the remote copy to all of the > >> difficulty of packing large

Re: Git for games working group

2018-09-17 Thread Taylor Blau
On Mon, Sep 17, 2018 at 05:00:10PM +0200, Ævar Arnfjörð Bjarmason wrote: > > 2. Multi-file locks, e.g., "I need to lock file(s) X, Y, and Z > > together." This isn't possible in Git LFS today with the existing "git > > lfs lock" command (I had to check, but it takes only _one_ filename

Re: [Question] Alternative to git-lfs under go

2018-09-17 Thread Taylor Blau
Hi Randall, On Mon, Sep 17, 2018 at 05:55:55PM -0400, Randall S. Becker wrote: > On September 17, 2018 3:28 PM, Jonathan Nieder wrote: > > Randall S. Becker wrote: > > > > > Does anyone know whether it is practical to rework git-lfs under a > > > language other than "go"? GCC is not even close to

Re: [PATCH] Add an EditorConfig file

2018-09-17 Thread Taylor Blau
Hi brian, Thanks for CC-ing me on this. I use editorconfig every day via the configuration in my home directory [1], and the Vim plugin editorconfig-vim [2]. It's a great piece of software, and I've been using it without any issue since around the beginning of 2015. On Mon, Sep 17, 2018 at 11:03

Re: [PATCH] config doc: add missing list separator for checkout.optimizeNewBranch

2018-09-18 Thread Taylor Blau
the added > documentation all got squashed into one paragraph. Fix that by adding > the list separator. Looks good. Here's my: Signed-off-by: Taylor Blau Thanks, Taylor

Re: [PATCH] config doc: add missing list separator for checkout.optimizeNewBranch

2018-09-18 Thread Taylor Blau
On Tue, Sep 18, 2018 at 01:16:43PM -0400, Jeff King wrote: > On Tue, Sep 18, 2018 at 12:57:07PM -0400, Taylor Blau wrote: > > > Hi Ævar, > > > > On Tue, Sep 18, 2018 at 05:34:49AM +, Ævar Arnfjörð Bjarmason wrote: > > > The documentation added in fa6

Re: [PATCH] t3701-add-interactive: tighten the check of trace output

2018-09-18 Thread Taylor Blau
On Mon, Sep 10, 2018 at 10:18:34AM -0400, Taylor Blau wrote: > Signed-off-by: Taylor Blau Oops, this should be: Reviewed-by: Taylor Blau Thanks, Taylor

Re: [PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Taylor Blau
but I am appreciative of you doing it, too :-). I could take or leave 2/2, since I usually write ", (see: above)", but I'm not sure if that's grammatically correct or not. But, either approach is fine with me, so both of these have my: Reviewed-by: Taylor Blau Thanks, Taylor

[PATCH 0/3] Filter alternate references

2018-09-20 Thread Taylor Blau
' in the alternate. In a previous version of this series, I taught the configuration property to the alternate, as in "these are the references that _I_ think _you_ will find interesting," rather than the other way around. I ultimately decided on what is attached here so that the fork

[PATCH 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-20 Thread Taylor Blau
lternate A, only heads from B) provide the path of the alternate as the first argument. Signed-off-by: Taylor Blau --- Documentation/config.txt | 6 + t/t5410-receive-pack.sh | 47 transport.c | 19 3 files changed, 68 i

[PATCH 1/3] transport.c: extract 'fill_alternate_refs_command'

2018-09-20 Thread Taylor Blau
te_refs' to 'fill_alternate_refs_command'. Signed-off-by: Taylor Blau --- transport.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/transport.c b/transport.c index 1c76d64aba..24ae3f375d 100644 --- a/transport.c +++ b/transport.c @@ -1325

[PATCH 3/3] transport.c: introduce core.alternateRefsPrefixes

2018-09-20 Thread Taylor Blau
ishes to specify multiple prefixes, they may separate them by whitespace. If "core.alternateRefsCommand" is set, it will take precedence over "core.alternateRefsPrefixes". Signed-off-by: Taylor Blau --- Documentation/config.txt | 6 ++ t/t5410-receive-pack.sh | 11 ++

Re: [PATCH 0/3] Filter alternate references

2018-09-20 Thread Taylor Blau
Hi Stefan, On Thu, Sep 20, 2018 at 11:35:23AM -0700, Stefan Beller wrote: > > To make the reference advertisement manageable even with a large number > > of references, let's allow the fork to select which ones it thinks might > > be "interesting", and only advertise those. This makes the advertis

Re: [PATCH 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-20 Thread Taylor Blau
On Thu, Sep 20, 2018 at 03:37:51PM -0400, Jeff King wrote: > On Thu, Sep 20, 2018 at 02:04:11PM -0400, Taylor Blau wrote: > > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > index 112041f407..b908bc5825 100644 > > --- a/Documentation/config.txt

Re: [PATCH 3/3] transport.c: introduce core.alternateRefsPrefixes

2018-09-20 Thread Taylor Blau
On Thu, Sep 20, 2018 at 03:47:34PM -0400, Jeff King wrote: > On Thu, Sep 20, 2018 at 02:04:13PM -0400, Taylor Blau wrote: > > > The recently-introduced "core.alternateRefsCommand" allows callers to > > specify with high flexibility the tips that they wish to adverti

Re: [PATCH 3/3] transport.c: introduce core.alternateRefsPrefixes

2018-09-21 Thread Taylor Blau
On Fri, Sep 21, 2018 at 03:19:20AM -0400, Eric Sunshine wrote: > On Thu, Sep 20, 2018 at 2:04 PM Taylor Blau wrote: > > The recently-introduced "core.alternateRefsCommand" allows callers to > > specify with high flexibility the tips that they wish to advertise

Re: [PATCH 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-21 Thread Taylor Blau
On Fri, Sep 21, 2018 at 09:39:14AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > +extract_haves () { > > + depacketize - | grep -o '^.* \.have' > > Not portable, isn't it? > > cf. http://pubs.opengroup.org/onlinepubs/9699919799/utilities/g

Re: [PATCH 3/3] transport.c: introduce core.alternateRefsPrefixes

2018-09-21 Thread Taylor Blau
On Fri, Sep 21, 2018 at 09:45:11AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > ...' block with your suggestion above. It's tempting to introduce it as: > > > > expect_haves() { > > printf "%s .have\n" $(git rev-parse -- $@) >

Re: [PATCH 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-21 Thread Taylor Blau
On Fri, Sep 21, 2018 at 01:48:25PM -0400, Taylor Blau wrote: > On Fri, Sep 21, 2018 at 09:39:14AM -0700, Junio C Hamano wrote: > > Taylor Blau writes: > > > > > +extract_haves () { > > > + depacketize - | grep -o '^.* \.have' > > > > Not po

[PATCH v2 1/3] transport.c: extract 'fill_alternate_refs_command'

2018-09-21 Thread Taylor Blau
te_refs' to 'fill_alternate_refs_command'. Signed-off-by: Taylor Blau --- transport.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/transport.c b/transport.c index 1c76d64aba..24ae3f375d 100644 --- a/transport.c +++ b/transport.c @@ -1325

[PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

2018-09-21 Thread Taylor Blau
ishes to specify multiple prefixes, they may separate them by whitespace. If "core.alternateRefsCommand" is set, it will take precedence over "core.alternateRefsPrefixes". Signed-off-by: Taylor Blau --- Documentation/config.txt | 7 +++ t/t5410-receive-pack.sh | 8 ++

[PATCH v2 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-21 Thread Taylor Blau
lternate A, only heads from B) provide the path of the alternate as the first argument. Signed-off-by: Taylor Blau --- Documentation/config.txt | 11 t/t5410-receive-pack.sh | 54 transport.c | 19 +++--- 3 files changed, 80 i

[PATCH v2 0/3] Filter alternate references

2018-09-21 Thread Taylor Blau
..@mail.gmail.com/ [3]: https://public-inbox.org/git/xmqqlg7ux0st@gitster-ct.c.googlers.com/ Taylor Blau (3): transport.c: extract 'fill_alternate_refs_command' transport.c: introduce core.alternateRefsCommand transport.c: introduce core.alternateR

Re: Git for games working group

2018-09-24 Thread Taylor Blau
On Sun, Sep 23, 2018 at 01:56:37PM -0400, Randall S. Becker wrote: > On September 23, 2018 1:29 PM, John Austin wrote: > > I've been putting together a prototype file-locking implementation for a > > system that plays better with git. What are everyone's thoughts on > > something like the following

Re: Git for games working group

2018-09-24 Thread Taylor Blau
On Sun, Sep 23, 2018 at 12:53:58PM -0700, John Austin wrote: > On Sun, Sep 23, 2018 at 10:57 AM Randall S. Becker > wrote: > > I would even like to help with your effort and have non-unixy platforms > > I'd like to do this on. > > Having this separate from git LFS is an even better idea IMO, and

Re: [PATCH] worktree: add per-worktree config files

2018-09-24 Thread Taylor Blau
On Sun, Sep 23, 2018 at 07:04:38PM +0200, Nguyễn Thái Ngọc Duy wrote: > A new repo extension is added, worktreeConfig. When it is present: I was initially scratching my head at why this should be a repository extension, but... > - The special treatment for core.bare and core.worktree, to stay >

Re: Git for games working group

2018-09-24 Thread Taylor Blau
On Mon, Sep 24, 2018 at 08:34:44AM -0700, John Austin wrote: > Perhaps git-global-graph is a decent name. GGG? G3? :). The structure > right now in my head looks a bit like: > > Global Graph: > client - post-commit git hooks to push changes up to the GG I'm replying to this part of the email

Re: [PATCH] git help: promote 'git help -av'

2018-09-24 Thread Taylor Blau
On Mon, Sep 24, 2018 at 02:19:28PM -0400, Jeff King wrote: > On Sat, Sep 22, 2018 at 07:47:07PM +0200, Nguyễn Thái Ngọc Duy wrote: > > > When you type "git help" (or just "git") you are greeted with a list > > with commonly used commands and their short description and are > > suggested to use "git

Re: Git for games working group

2018-09-25 Thread Taylor Blau
On Mon, Sep 24, 2018 at 09:05:56PM -0700, John Austin wrote: > On Mon, Sep 24, 2018 at 12:58 PM Taylor Blau wrote: > > I'm replying to this part of the email to note that this would cause Git > > LFS to have to do some extra work, since running 'git lfs install' &g

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

2018-09-25 Thread Taylor Blau
On Tue, Sep 25, 2018 at 10:41:18AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Right, I think that is totally fine for the current uses. I guess my > > question was: do you envision cutting the interface down to only the > > oids to bite us in the future? > > > > I was on the fence duri

Re: [PATCH 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-25 Thread Taylor Blau
On Fri, Sep 21, 2018 at 12:59:16PM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > In fact, I think that we can go even further: since we don't need to > > catch the beginning '^.*' (without -o), we can instead: > > > > extract_haves () { &

Re: [PATCH v2 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-25 Thread Taylor Blau
On Fri, Sep 21, 2018 at 04:18:03PM -0400, Eric Sunshine wrote: > On Fri, Sep 21, 2018 at 2:47 PM Taylor Blau wrote: > > When in a repository containing one or more alternates, Git would > > sometimes like to list references from its alternates. For example, 'git > > rece

Re: [PATCH v2 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-25 Thread Taylor Blau
On Fri, Sep 21, 2018 at 02:09:08PM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > +core.alternateRefsCommand:: > > + When listing references from an alternate (e.g., in the case of > > ".have"), use > > It is not clear how (e.g.,...) connects t

Re: [PATCH v2 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-25 Thread Taylor Blau
On Sat, Sep 22, 2018 at 03:52:58PM -0400, Jeff King wrote: > On Sat, Sep 22, 2018 at 06:02:31PM +, brian m. carlson wrote: > > > On Fri, Sep 21, 2018 at 02:47:43PM -0400, Taylor Blau wrote: > > > +expect_haves () { > > > + printf "%s .

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

2018-09-25 Thread Taylor Blau
On Tue, Sep 25, 2018 at 04:56:11PM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > My reading of this is threefold: > > > > 1. There are some cosmetic changes that need to occur in t5410 and > > documentation, which are mentioned above. Those seem

Re: [PATCH v2 2/3] transport.c: introduce core.alternateRefsCommand

2018-09-26 Thread Taylor Blau
On Tue, Sep 25, 2018 at 11:33:37PM -0400, Jeff King wrote: > On Tue, Sep 25, 2018 at 06:09:35PM -0700, Taylor Blau wrote: > > > > So I think this is fine (modulo that the grep and sed can be combined). > > > Yet another option would be to simply strip away everything ex

  1   2   3   4   5   6   >