Re: Raise your hand to Ack jk/code-of-conduct if your Ack fell thru cracks

2019-10-08 Thread Taylor Blau
ble check that these acks are real, but I'd still wait for a few > days for people who expressed their Acks but your scan missed, or > those who wanted to give their Acks but forgot to do so, to raise > their hands on this thread. I'd be quite pleased to join those above with my stron

Re: [PATCH 0/1] git-config --add allows values from stdin

2019-09-21 Thread Taylor Blau
Hi ZJ, On Tue, Sep 17, 2019 at 03:31:34PM +0200, Zeger-Jan van de Weg wrote: > When adding or updating configuration values using git-config, the > values could all be observed by different processes as these are passed > as arguments. In some environments all commands executed are also all > logg

Re: What's cooking in git.git (Sep 2019, #02; Wed, 18)

2019-09-20 Thread Taylor Blau
On Wed, Sep 18, 2019 at 03:33:15PM -0700, Junio C Hamano wrote: > * tb/commit-graph-harden (2019-09-09) 3 commits > - commit-graph.c: handle corrupt/missing trees > - commit-graph.c: handle commit parsing errors > - t/t5318: introduce failing 'git commit-graph write' tests > > The code to parse

Re: [PATCH v2] upload-pack commit graph segfault fix

2019-09-12 Thread Taylor Blau
On Thu, Sep 12, 2019 at 10:41:22AM -0400, Jeff King wrote: > Here's a re-roll of my "disable commit graph more gently" fix. Versus > v1: Thanks for sending a re-roll. I deployed this out to all of our servers running git at GitHub, and it seems to be working fine. For what it's worth, I don't hav

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-11 Thread Taylor Blau
On Wed, Sep 11, 2019 at 08:18:46PM -0400, Jeff King wrote: > On Wed, Sep 11, 2019 at 08:04:14PM -0400, Jeff King wrote: > > > When the client has asked for certain shallow options like > > "deepen-since", we do a custom rev-list walk that pretends to be > > shallow. Before doing so, we have to disa

Re: [PATCH] upload-pack: disable commit graph more gently for shallow traversal

2019-09-11 Thread Taylor Blau
Hi Peff, Thanks in advance for digging into all of this. I feel guilty for having found the issue myself, and then gotten a headache for just long enough to have you completely fix the issue by the time that I got back. So, thanks :-). On Wed, Sep 11, 2019 at 08:04:15PM -0400, Jeff King wrote: >

Re: [RFC PATCH 1/1] for-each-ref: add '--no-symbolic' option

2019-09-07 Thread Taylor Blau
On Sat, Sep 07, 2019 at 07:28:21PM -0400, Taylor Blau wrote: > ... Oh, great. I was pretty sure that vger accidentally ate my last mail, but I guess not. Sorry for the re-send. Thanks, Taylor

Re: [RFC PATCH 1/1] for-each-ref: add '--no-symbolic' option

2019-09-07 Thread Taylor Blau
Hi Eric, On Sat, Sep 07, 2019 at 03:36:46PM -0600, Eric Freese wrote: > Using the new flag will omit symbolic refs from the output. > > Without this flag, it is possible to get this behavior by using the > `%(symref)` formatting field name and piping output through grep to > include only those ref

Re: [RFC PATCH 1/1] for-each-ref: add '--no-symbolic' option

2019-09-07 Thread Taylor Blau
Hi Eric, On Sat, Sep 07, 2019 at 03:36:46PM -0600, Eric Freese wrote: > Using the new flag will omit symbolic refs from the output. > > Without this flag, it is possible to get this behavior by using the > `%(symref)` formatting field name and piping output through grep to > include only those ref

Re: [RFC PATCH 0/1] for-each-ref: Add '--no-symbolic' option

2019-09-07 Thread Taylor Blau
Hi Eric, On Sat, Sep 07, 2019 at 03:36:45PM -0600, Eric Freese wrote: > Hi, > > I was recently using git-for-each-ref in a script to get a list of > remote refs that pointed at a particular commit so that they could > automatically be updated and pushed back to that remote. This fails when > it co

Re: [PATCH 2/2] commit-graph: turn off save_commit_buffer

2019-09-07 Thread Taylor Blau
On Sat, Sep 07, 2019 at 01:04:40AM -0400, Jeff King wrote: > The commit-graph tool may read a lot of commits, but it only cares about > parsing their metadata (parents, trees, etc) and doesn't ever show the > messages to the user. And so it should not need save_commit_buffer, > which is meant for h

Re: [PATCH 1/2] commit-graph: don't show progress percentages while expanding reachable commits

2019-09-07 Thread Taylor Blau
On Sat, Sep 07, 2019 at 12:34:07PM +0200, SZEDER Gábor wrote: > On Sat, Sep 07, 2019 at 01:01:33AM -0400, Jeff King wrote: > > From: SZEDER Gábor > > > > Commit 49bbc57a57 (commit-graph write: emit a percentage for all > > progress, 2019-01-19) was a bit overeager when it added progress > > percen

Re: [PATCH 3/3] commit-graph.c: handle corrupt/missing trees

2019-09-06 Thread Taylor Blau
On Fri, Sep 06, 2019 at 02:19:20AM -0400, Jeff King wrote: > On Thu, Sep 05, 2019 at 06:04:57PM -0400, Taylor Blau wrote: > > > @@ -846,7 +847,11 @@ static void write_graph_chunk_data(struct hashfile *f, > > int hash_len, > > if (par

Re: [PATCH] t: use common $SQ variable

2019-09-05 Thread Taylor Blau
On Thu, Sep 05, 2019 at 06:25:26PM -0400, Taylor Blau wrote: > On Thu, Sep 05, 2019 at 03:10:05PM -0700, Denton Liu wrote: > > In many test scripts, there are bespoke definitions of the single quote > > that are some variation of this: > > > > SQ="'&quo

Re: [PATCH] t: use common $SQ variable

2019-09-05 Thread Taylor Blau
On Thu, Sep 05, 2019 at 03:10:05PM -0700, Denton Liu wrote: > In many test scripts, there are bespoke definitions of the single quote > that are some variation of this: > > SQ="'" > > Define a common $SQ variable in test-lib.sh and replace all usages of > these bespoke variables with the common

[PATCH 0/3] commit-graph: harden against various corruptions

2019-09-05 Thread Taylor Blau
ps://public-inbox.org/git/20190905064723.gc21...@sigill.intra.peff.net/ Taylor Blau (3): t/t5318: introduce failing 'git commit-graph write' tests commit-graph.c: handle commit parsing errors commit-graph.c: handle corrupt/missing trees commit-graph.c | 11 +-- commit.

[PATCH 2/3] commit-graph.c: handle commit parsing errors

2019-09-05 Thread Taylor Blau
ell how corrupt an object is without digging into it. Presumably one could change the meaning of 'parse_object' returns, but this would require adjusting each callsite accordingly. Instead of that, add an additional check to the object parsed. Signed-off-by: Taylor Blau --- commit

[PATCH 1/3] t/t5318: introduce failing 'git commit-graph write' tests

2019-09-05 Thread Taylor Blau
e commit. Both of these cases cause segfaults, each at different lines. Signed-off-by: Taylor Blau --- t/t5318-commit-graph.sh | 43 + 1 file changed, 43 insertions(+) diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index ab3eccf0fa..c855f81930 1

[PATCH 3/3] commit-graph.c: handle corrupt/missing trees

2019-09-05 Thread Taylor Blau
et_commit_tree' returns something non-NULL before digging through a structure that is not there, thus preventing a segfault down the line in the commit graph code. Signed-off-by: Taylor Blau --- commit-graph.c | 7 ++- commit.c| 3 ++- t/t5318-commit-graph.sh |

Re: [PATCH] t: use LF variable defined in the test harness

2019-09-05 Thread Taylor Blau
On Thu, Sep 05, 2019 at 11:17:57AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > > - t/t3005: this script calls the variable '$new_line', but could be > > renamed to LF and then removed in a second patch > > It is worse than that, isn't it?

Re: [RFC PATCH 0/1] commit-graph.c: handle corrupt commit trees

2019-09-04 Thread Taylor Blau
Hi Garima, On Wed, Sep 04, 2019 at 02:25:55PM -0400, Garima Singh wrote: > > On 9/3/2019 10:22 PM, Taylor Blau wrote: > > Hi, > > > > I was running some of the new 'git commit-graph' commands, and noticed > > that I could consistently get 'git commit-

Re: [RFC PATCH 1/1] commit-graph.c: die on un-parseable commits

2019-09-04 Thread Taylor Blau
Hi Peff, On Tue, Sep 03, 2019 at 11:04:56PM -0400, Jeff King wrote: > On Tue, Sep 03, 2019 at 10:22:57PM -0400, Taylor Blau wrote: > > > When we write a commit graph chunk, we process a given list of 'struct > > commit *'s and parse out the parent(s) and tree OID i

Re: [PATCH 1/1] contrib/git-jump/git-jump: support alias expansion

2019-09-04 Thread Taylor Blau
On Wed, Sep 04, 2019 at 01:55:03PM -0400, Taylor Blau wrote: > @@ -68,7 +70,7 @@ if test $# -lt 1; then > usage >&2 > exit 1 > fi > -mode=$1; shift > +mode="$(git config --default "$1" --get -- "alias.$1")"; shift > > tra

[PATCH 0/1] contrib/git-jump: support alias expansion

2019-09-04 Thread Taylor Blau
plains that it doesn't know what 'di' means. Let's rectify that by teaching it how to expand alises, which is implemented in the patch below. Thanks, Taylor Taylor Blau (1): contrib/git-jump/git-jump: support alias expansion contrib/git-jump/README | 4 contrib/git-jump/git-jump | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.22.0

[PATCH 1/1] contrib/git-jump/git-jump: support alias expansion

2019-09-04 Thread Taylor Blau
es before calling the mode-specific subroutine. Do so by fetching the configuration value of 'alias.$1', defaulting to "$1" in the case that no alias is set. Signed-off-by: Taylor Blau --- contrib/git-jump/README | 4 contrib/git-jump/git-jump | 4 +++- 2 files change

[RFC PATCH 0/1] commit-graph.c: handle corrupt commit trees

2019-09-03 Thread Taylor Blau
memory, but maybe I'm thinking about it the wrong way. Depending on the approach here, I'll clean up the commit and message, as well as add a test that demonstrates the breakage and subsequent fix. Thanks in advance for your feedback :-). Taylor Blau (1): commit-graph.c: die

[RFC PATCH 1/1] commit-graph.c: die on un-parseable commits

2019-09-03 Thread Taylor Blau
hunk_data' to stop when a commit isn't able to be parsed, at the peril of failing to write a commit-graph. Signed-off-by: Taylor Blau --- commit-graph.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index f2888c203b..6aa6998e

Re: [PATCH] t: use LF variable defined in the test harness

2019-09-03 Thread Taylor Blau
Hi Junio, On Tue, Sep 03, 2019 at 02:11:22PM -0700, Junio C Hamano wrote: > A few test scripts assign a single LF to $LF, but that is already > given by test-lib.sh to everybody. I didn't know that 't/test-lib.sh' provided '$LF' (as I'm sure was the case for the respective authors of those tests

Re: Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Taylor Blau
Hi, On Tue, Sep 03, 2019 at 03:44:14PM +0300, Σταύρος Ντέντος wrote: > Hello there, > > While the name is obviously a mistake, git refuses to even acknowledge > the directory. > > ``` > u@h:~/$ mkdir init-test > u@h:~/$ cd init-test > u@h:~/init-test$ git init > Initialized empty Git repository in

Re: [PATCH] rebase: introduce --update-branches option

2019-09-02 Thread Taylor Blau
Hi Junio, On Mon, Sep 02, 2019 at 06:21:33PM -0700, Junio C Hamano wrote: > "brian m. carlson" writes: > > > I like the idea of using existing tooling for this and not needing an > > additional verb. > > > > My gut tells me folks may want a bit more control over *which* branches > > are rebased,

Re: [PATCH 1/1] checkout: add simple check for 'git checkout -b'

2019-08-29 Thread Taylor Blau
Hi Elijah, On Thu, Aug 29, 2019 at 05:19:44PM -0700, Elijah Newren wrote: > On Thu, Aug 29, 2019 at 2:42 PM Pratyush Yadav wrote: > > > > On 30/08/19 02:00AM, Pratyush Yadav wrote: > > > On 29/08/19 04:07PM, Derrick Stolee wrote: > > > > On 8/29/2019 2:54 PM, Phillip Wood wrote: > > > > > Hi Stol

Re: "git commit" of single file takes 5 minutes, mounted fileystem/diskimage with 50G GIT repo + 900G of builds articles

2019-08-27 Thread Taylor Blau
Hi Saravanan, On Mon, Aug 26, 2019 at 08:43:34PM +, Saravanan Shanmugham (sarvi) wrote: > > Based on a previous thread “First Git status takes 40+ minutes, when mounting > fileystem/diskimage with 50G GIT repo + 900G of builds articles” > > The context is that > 1. git wokspace was clone(50

Re: [PATCH 0/1] banned.h: fix vsprintf warning

2019-08-26 Thread Taylor Blau
On Mon, Aug 26, 2019 at 02:33:17PM -0400, Jeff King wrote: > On Mon, Aug 26, 2019 at 09:24:10AM -0700, Junio C Hamano wrote: > > > "Andrey Portnoy via GitGitGadget" writes: > > > > > Previously sprintf was the argument to the BANNED macro, where vsprintf is > > > expected. > > > > Good eyes. Than

[PATCH] banned.h: fix vsprintf()'s ban message

2019-08-25 Thread Taylor Blau
version does not have the same typo. Fix this by updating the explicit form of 'vsprintf' as the banned version of itself, not 'sprintf'. Signed-off-by: Taylor Blau --- banned.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/banned.h b/banned.h inde

Re: v2.22.1 and later regression wrt display of progress indicators

2019-08-22 Thread Taylor Blau
On Thu, Aug 22, 2019 at 12:29:08PM -0400, Jeff King wrote: > On Thu, Aug 22, 2019 at 06:07:02PM +0200, SZEDER Gábor wrote: > > > On Thu, Aug 22, 2019 at 10:20:08AM -0400, Charles Diza wrote: > > > By 2.22.1 at the latest (and continuing into 2.23.0) there is a > > > problem with the display of prog

Re: v2.22.1 and later regression wrt display of progress indicators

2019-08-22 Thread Taylor Blau
Hi, On Thu, Aug 22, 2019 at 06:07:02PM +0200, SZEDER Gábor wrote: > On Thu, Aug 22, 2019 at 10:20:08AM -0400, Charles Diza wrote: > > By 2.22.1 at the latest (and continuing into 2.23.0) there is a > > problem with the display of progress indication during `git pull` > > (and possibly other comman

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

2019-08-09 Thread Taylor Blau
Hi Ariadne, On Thu, Aug 08, 2019 at 10:21:02PM -0500, Ariadne Conill wrote: > Hello, > > On Thu, Aug 8, 2019 at 10:07 PM Phil Hord wrote: > > > > The issue of deadnaming aside, turning on log.mailmap by default is > > the sensible thing to do given that other Git features already honor > > it tha

Re: Git For Windows' installer can't see my Atom installation.

2019-08-09 Thread Taylor Blau
Hi Jadian, On Fri, Aug 09, 2019 at 12:31:12AM -0500, Jadian Radiator wrote: > Git For Windows' installer can't see my Atom installation. > I got Atom directly from Atom's official site. This is the Git mailing list, which does not answers questions about Git for Windows, or Atom, both of which ar

Re: [PATCH] apply: reload .gitattributes after patching it

2019-08-09 Thread Taylor Blau
git checkout -b test HEAD^ && > + > + echo "*.txt filter=test" >.gitattributes && > + git add .gitattributes && > + test_commit third && > + > + echo "This text is smudged." >a.txt && > + git add a.txt && > + test_commit fourth && > + git rebase master && > + grep "smudged" a.txt > + ) > +' > + This definitely exercise the behavior here. Thanks for adding a test while you're at it. > test_expect_success 'rebase--merge.sh and --show-current-patch' ' > test_create_repo conflict-merge && > ( I wouldn't be opposed to renaming 'dummy' to be something else, but in the case that you don't feel a re-roll is necessary, please consider my: Reviewed-by: Taylor Blau Thanks, Taylor

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

2019-08-08 Thread Taylor Blau
yself transgender, instead I am simply raising an issue that I found myself concerning. On Thu, Aug 08, 2019 at 09:34:15PM -0400, Ariadne Conill wrote: > Hello, > > On August 8, 2019 8:13:15 PM EDT, Taylor Blau wrote: > >Hi Junio, > > > >On Thu, Jul 25, 2019 at 05:19:

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

2019-08-08 Thread Taylor Blau
Hi Junio, On Thu, Jul 25, 2019 at 05:19:23PM -0700, Junio C Hamano wrote: > 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 ones marked with '.' do not appear in any of > the integrat

Re: RFC - Git Developer Blog

2019-08-07 Thread Taylor Blau
On Wed, Aug 07, 2019 at 10:15:43AM -0700, Junio C Hamano wrote: > Taylor Blau writes: > > >> It would also be helpful to have a post for every major release > >> highlighting new features and giving users examples of how to use them. > >> Taylor has been writing

Re: RFC - Git Developer Blog

2019-08-07 Thread Taylor Blau
Hi Emily, On Tue, Aug 06, 2019 at 02:00:15PM -0700, Emily Shaffer wrote: > On Tue, Aug 06, 2019 at 08:19:15AM -0400, Derrick Stolee wrote: > > On 8/6/2019 12:52 AM, Andrew Ardill wrote: > > > On Tue, 6 Aug 2019 at 11:51, Emily Shaffer > > > wrote: > > > > > >> Are folks interested in writing and

Re: RFC - Git Developer Blog

2019-08-07 Thread Taylor Blau
Hi Stolee, On Tue, Aug 06, 2019 at 08:19:15AM -0400, Derrick Stolee wrote: > On 8/6/2019 12:52 AM, Andrew Ardill wrote: > > On Tue, 6 Aug 2019 at 11:51, Emily Shaffer wrote: > > > >> Are folks interested in writing and reviewing this kind of content? > > I am interested in writing and reviewing!

Re: RFC - Git Developer Blog

2019-08-07 Thread Taylor Blau
On Tue, Aug 06, 2019 at 09:27:30AM -0400, Jeff King wrote: > On Tue, Aug 06, 2019 at 06:59:21AM +0200, Christian Couder wrote: > > > When Git Rev News was started I thought that there could be such a > > group effort to encourage each other to publish articles in it, but I > > must say that outside

Re: [PATCH 0/3] --end-of-options marker

2019-08-07 Thread Taylor Blau
On Wed, Aug 07, 2019 at 04:17:49AM +, brian m. carlson wrote: > On 2019-08-06 at 23:43:20, Jeff King wrote: > > On Tue, Aug 06, 2019 at 10:58:53PM +, brian m. carlson wrote: > > > Sorry, I hadn't had a chance to look at this series in depth, but I was > > > wondering: could we not just acce

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. >

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: [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

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] 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: 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: 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: [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: [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

[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-

[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

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 >

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: 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: 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, #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, #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-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: [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: [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

[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

[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 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

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

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-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] 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 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 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 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][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: [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: [[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: [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: [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 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
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

[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

[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 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

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 >

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: [BUG] Suspected with double asterisk in conditional include pattern

2019-03-22 Thread Taylor Blau
Hi Jason, On Thu, Mar 14, 2019 at 01:30:43PM -0400, Jason Karns wrote: > Hello, > > I believe I've encountered a bug regarding the use of double asterisk > ( /**/ ) within includeIf patterns. > > git-config man pages state that > > **/ and /**, that can match multiple path components > > They

Re: [PATCH 1/1] check-docs: fix for setups where executables have an extension

2019-03-22 Thread Taylor Blau
Hi Johannes, On Wed, Mar 13, 2019 at 04:56:53AM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > On Windows, for example, executables (must) have the extension `.exe`. > Our `check-docs` target was not prepared for that. > > Signed-off-by: Johannes Schindelin >

  1   2   3   4   5   6   >