[L10N] Kickoff for Git 2.21.0 round #2

2019-02-14 Thread Jiang Xin
Hi, Git v2.21.0-rc1 introduced 3 update messages from commit 32ceace39f (Fix typos in translatable strings for v2.21.0, 2019-02-11). let's start new round of git l10n based on the following commit: l10n: git.pot: v2.21.0 round 2 (3 new, 3 removed) Introduce 3 update messages for v2.

Re: [Bug report] git diff stat shows unrelated diff

2019-02-14 Thread Viresh Kumar
On 14-02-19, 13:23, Elijah Newren wrote: > I think you're getting tripped up by double-dot vs triple-dot with > diff being different than log: > > `git diff D..E` means the same thing as `git diff D E`, i.e. diff the > two commits D and E. Right, so both the branches have at least until rc2 (thou

Re: Re* [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-14 Thread Martin Ågren
On Fri, 15 Feb 2019 at 03:13, Junio C Hamano wrote: > > Subject: [PATCH] t1404: do not rely on the exact phrasing of strerror() > > Not even in C locale, it is wrong to expect that the exact phrasing > "File exists" is used to show EEXIST. s/Not even/Even/? Or s/wrong to expect that/portable to r

[PATCH v5 4/8] evolve: add support for parsing metacommits

2019-02-14 Thread sxenos
From: Stefan Xenos This patch adds the get_metacommit_content method, which can classify commits as either metacommits or normal commits, determine whether they are abandoned, and extract the content commit's object id from the metacommit. Signed-off-by: Stefan Xenos --- Makefile|

[PATCH v5 7/8] evolve: implement the git change command

2019-02-14 Thread sxenos
From: Stefan Xenos Implement the git change update command, which are sufficient for constructing change graphs. For example, to create a new change (a stable name) that refers to HEAD: git change update -c HEAD To record a rebase or amend in the change graph: git change update -c -r To re

[PATCH v5 1/8] technical doc: add a design doc for the evolve command

2019-02-14 Thread sxenos
From: Stefan Xenos This document describes what a change graph for git would look like, the behavior of the evolve command, and the changes planned for other commands. Signed-off-by: Stefan Xenos --- Documentation/technical/evolve.txt | 1051 1 file changed, 1051 i

[PATCH v5 3/8] ref-filter: add the metas namespace to ref-filter

2019-02-14 Thread sxenos
From: Stefan Xenos The metas namespace will contain refs for changes in progress. Add support for searching this namespace. Signed-off-by: Stefan Xenos --- ref-filter.c | 8 ++-- ref-filter.h | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ref-filter.c b/ref-filte

[PATCH v5 8/8] evolve: add the git change list command

2019-02-14 Thread sxenos
From: Stefan Xenos This command lists the ongoing changes from the refs/metas namespace. Signed-off-by: Stefan Xenos --- builtin/change.c | 51 1 file changed, 51 insertions(+) diff --git a/builtin/change.c b/builtin/change.c index 807d148805..

[PATCH v5 2/8] sha1-array: implement oid_array_readonly_contains

2019-02-14 Thread sxenos
From: Stefan Xenos Implement a "readonly_contains" function for oid_array that won't sort the array if it is unsorted. This can be used to test containment in the rare situations where the array order matters. The function has intentionally been given a name that is more cumbersome than the "loo

[PATCH v5 6/8] evolve: add support for writing metacommits

2019-02-14 Thread sxenos
From: Stefan Xenos metacommit.c supports the creation of metacommits and adds the API needed to create and update changes. Create the "modify_change" function that can be called from modification commands like "rebase" and "git amend" to record obsolescences in the change graph. Create the "rec

[PATCH v5 5/8] evolve: add the change-table structure

2019-02-14 Thread sxenos
From: Stefan Xenos A change table stores a list of changes, and supports efficient lookup from a commit hash to the list of changes that reference that commit directly. It can be used to look up content commits or metacommits at the head of a change, but does not support lookup of commits refere

Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1 (stack traces inside)

2019-02-14 Thread Max Kirillov
On Thu, Feb 14, 2019 at 06:33:56PM -0500, Randall S. Becker wrote: > Here is the full set of traces (from subtest 6, which just hung). There are > no I/O errors reported on any pipe or file descriptor. There is one git > process waiting for a read to occur but no one is doing any writing. Most > pr

Re: [PATCH v2] read-cache: add post-indexchanged hook

2019-02-14 Thread Ben Peart
On 2/14/2019 3:33 PM, Junio C Hamano wrote: Ramsay Jones writes: On 14/02/2019 14:42, Ben Peart wrote: From: Ben Peart Add a post-indexchanged hook that is invoked after the index is written in s/post-indexchanged/post-index-changed/ Good. I wasn't paying close attention to the prev

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1 (stack traces inside)

2019-02-14 Thread Randall S. Becker
On February 14, 2019 17:34, Max Kirillov wrote: > To: Randall S. Becker > Cc: 'Johannes Schindelin via GitGitGadget' ; > git@vger.kernel.org; 'Junio C Hamano' ; 'Max Kirillov' > > Subject: Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1 > > On Thu, Feb 14, 2019 at 05:17:26PM -0500,

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

2019-02-14 Thread Randall S. Becker
On February 14, 2019 17:34, Max Kirillov wrote: > To: Randall S. Becker > Cc: 'Johannes Schindelin via GitGitGadget' ; > git@vger.kernel.org; 'Junio C Hamano' ; 'Max Kirillov' > > Subject: Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1 > > On Thu, Feb 14, 2019 at 05:17:26PM -0500,

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

2019-02-14 Thread Randall S. Becker
On February 14, 2019 17:39, Junio C Hamano wrote: > To: Randall S. Becker > Cc: 'Johannes Schindelin via GitGitGadget' ; > git@vger.kernel.org; 'Max Kirillov' > Subject: Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1 > > "Randall S. Becker" writes: > > > Unfortunately, subtest 13

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

2019-02-14 Thread Randall S. Becker
On February 14, 2019 17:34, Max Kirillov wrote: > On Thu, Feb 14, 2019 at 05:17:26PM -0500, Randall S. Becker wrote: > > Unfortunately, subtest 13 still hangs on NonStop, even with this > > patch, so our Pipeline still hangs. I'm glad it's better on Azure, but > > I don't think this actually addres

Re: [PATCH 5/5] remote-curl: use post_rpc() for protocol v2 also

2019-02-14 Thread Junio C Hamano
Jonathan Tan writes: > + # Ensure that the list of wants is greater than http.postbuffer below > + for i in $(seq 1 1500) test_seq. > + do > + test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/big" "commit$i" > + done && > + > + GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CU

Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

2019-02-14 Thread Max Kirillov
On Thu, Feb 14, 2019 at 05:17:26PM -0500, Randall S. Becker wrote: > Unfortunately, subtest 13 still hangs on NonStop, even > with this patch, so our Pipeline still hangs. I'm glad > it's better on Azure, but I don't think this actually > addresses the root cause of the hang. This is now the > four

Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

2019-02-14 Thread Junio C Hamano
"Randall S. Becker" writes: > Unfortunately, subtest 13 still hangs on NonStop, even with this > patch, so our Pipeline still hangs. I'm glad it's better on Azure, > but I don't think this actually addresses the root cause of the > hang. Sigh. > possible this is not the test that is failing, bu

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results)

2019-02-14 Thread Randall S. Becker
On February 14, 2019 16:37, Johannes Schindelin wrote: > On Thu, 14 Feb 2019, Randall S. Becker wrote: > > > t5562 still hangs (blocking) - this breaks our CI pipeline since the > > test hangs and we have no explanation of whether the hang is in git or > > the tests. > > I have "good" news: it no

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

2019-02-14 Thread Randall S. Becker
On February 14, 2019 16:33, Johannes Schindelin wrote: > To: git@vger.kernel.org > Cc: Randall Becker ; Junio C Hamano > > Subject: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1 > > The last-minute patch to replace /dev/zero with a Perl script snippet broke > the Linux part of the CI b

Re: [PATCH 1/1] tests: teach the test-tool to generate NUL bytes and use it

2019-02-14 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > In cc95bc2025 (t5562: replace /dev/zero with a pipe from > generate_zero_bytes, 2019-02-09), we replaced usage of /dev/zero (which > is not available on NonStop, apparently) by a Perl script snippet to > generate NUL

Re: [Bug report] git diff stat shows unrelated diff

2019-02-14 Thread Junio C Hamano
Elijah Newren writes: > The only thing I seem to be able to retain is the following: "git > diff D..E is totally useless and should be an error because (1) it > doesn't do what I expect and (2) for folks that want the behavior > currently gotten with that syntax can instead just use a space inst

Re: [GSoC][RFC PATCH] clone: use dir-iterator to avoid explicit dir traversal

2019-02-14 Thread Matheus Tavares Bernardino
On Thu, Feb 14, 2019 at 7:16 PM Christian Couder wrote: > > On Thu, Feb 14, 2019 at 1:16 PM Matheus Tavares > wrote: > > > > Replace usage of opendir/readdir/closedir API to traverse directories > > recursively, at copy_or_link_directory function, by the dir-iterator > > API. > > > > Signed-off-b

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results)

2019-02-14 Thread Johannes Schindelin
Hi Randall, On Thu, 14 Feb 2019, Randall S. Becker wrote: > t5562 still hangs (blocking) - this breaks our CI pipeline since the > test hangs and we have no explanation of whether the hang is in git or > the tests. I have "good" news: it now also hangs on Ubuntu 16.04 in Azure Pipelines' Linux a

[PATCH 1/1] tests: teach the test-tool to generate NUL bytes and use it

2019-02-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In cc95bc2025 (t5562: replace /dev/zero with a pipe from generate_zero_bytes, 2019-02-09), we replaced usage of /dev/zero (which is not available on NonStop, apparently) by a Perl script snippet to generate NUL bytes. Sadly, it does not seem to work on NonStop, as t5562

[PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

2019-02-14 Thread Johannes Schindelin via GitGitGadget
The last-minute patch to replace /dev/zero with a Perl script snippet broke the Linux part of the CI builds on Azure Pipelines: it timed out. The culprit is the rb/no-dev-zero-in-test branch (see the build for this branch here [https://dev.azure.com/gitgitgadget/git/_build/results?buildId=1727]).

Re: Git - logo commercial use

2019-02-14 Thread Christian Couder
Hi, On Thu, Feb 14, 2019 at 12:50 PM Agnieszka Borcz wrote: > We would love to be able to include your logo as part of our inventory but > aren’t sure of the restrictions regarding its use for commercial purposes, so > we would like to find out what your policy is regarding this and if this >

Re: [Bug report] git diff stat shows unrelated diff

2019-02-14 Thread Elijah Newren
Hi, On Thu, Feb 14, 2019 at 11:35 AM Viresh Kumar wrote: > > Hello, > > I am not sure if it is a bug or not, but the output I got wasn't what > I was looking for. And so looking for some help. I was looking to send > pull request [1] to PM maintainer and was generating the request > against his t

Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

2019-02-14 Thread Junio C Hamano
Todd Zullinger writes: > Jonathan Tan wrote: >>> 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added >>> GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings >>> from Apache when the variable is unset, as we do for GIT_VALGRIND* and >>> GIT_TRACE, from f62882548

Re: [GSoC][RFC PATCH] clone: use dir-iterator to avoid explicit dir traversal

2019-02-14 Thread Christian Couder
On Thu, Feb 14, 2019 at 1:16 PM Matheus Tavares wrote: > > Replace usage of opendir/readdir/closedir API to traverse directories > recursively, at copy_or_link_directory function, by the dir-iterator > API. > > Signed-off-by: Matheus Tavares > --- > This is my microproject for GSoC 2019. It's sti

Re: Re* [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-14 Thread Junio C Hamano
"Randall S. Becker" writes: > On February 14, 2019 15:16, Junio C Hamano wrote: >> Jeff King writes: >> >> > On Mon, Feb 11, 2019 at 01:07:15PM -0800, Junio C Hamano wrote: >> > >> >> >> test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File >> >> >> exists" err >> >> > >> >> > The messag

Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

2019-02-14 Thread Todd Zullinger
Jonathan Tan wrote: >> 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added >> GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings >> from Apache when the variable is unset, as we do for GIT_VALGRIND* and >> GIT_TRACE, from f628825481 ("t/lib-httpd: handle running

Re: What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-14 Thread Junio C Hamano
Jonathan Tan writes: >> * jt/test-protocol-version (2019-02-06) 9 commits >> - remote-curl: in v2, fill credentials if needed >> - t5552: compensate for v2 filtering ref adv. >> - tests: fix protocol version for overspecifications >> - t5700: only run with protocol version 1 >> - t5512: comp

Re: [PATCH] doc: format pathnames and URLs as monospace

2019-02-14 Thread Junio C Hamano
Corentin BOMPARD writes: > diff --git a/Documentation/config/checkout.txt > b/Documentation/config/checkout.txt > index c4118fa19..8ba92f274 100644 > --- a/Documentation/config/checkout.txt > +++ b/Documentation/config/checkout.txt > @@ -1,7 +1,7 @@ > checkout.defaultRemote:: > When you r

Re: [PATCH v2] read-cache: add post-indexchanged hook

2019-02-14 Thread Junio C Hamano
Ramsay Jones writes: > On 14/02/2019 14:42, Ben Peart wrote: >> From: Ben Peart >> >> Add a post-indexchanged hook that is invoked after the index is written in > > s/post-indexchanged/post-index-changed/ Good. I wasn't paying close attention to the previous round, but is that the only name-r

RE: Re* [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-14 Thread Randall S. Becker
On February 14, 2019 15:16, Junio C Hamano wrote: > Jeff King writes: > > > On Mon, Feb 11, 2019 at 01:07:15PM -0800, Junio C Hamano wrote: > > > >> >> test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File > >> >> exists" err > >> > > >> > The message does not match, does it? Here we grep

[PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer

2019-02-14 Thread Elijah Newren
Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer', 2019-02-06), --merge now uses the interactive backend (and matches its behavior) so there is no separate merge backend anymore. Fix an oversight in the docs that should have been updated with the previous change. Signed-off-b

Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

2019-02-14 Thread Jonathan Tan
> 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added > GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings > from Apache when the variable is unset, as we do for GIT_VALGRIND* and > GIT_TRACE, from f628825481 ("t/lib-httpd: handle running under > --valgrind", 20

Re* [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-14 Thread Junio C Hamano
Jeff King writes: > On Mon, Feb 11, 2019 at 01:07:15PM -0800, Junio C Hamano wrote: > >> >> test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err >> > >> > The message does not match, does it? Here we grep for "File exists" >> > but the message you showed says "File already exi

Re: What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-14 Thread Jonathan Tan
> * jt/test-protocol-version (2019-02-06) 9 commits > - remote-curl: in v2, fill credentials if needed > - t5552: compensate for v2 filtering ref adv. > - tests: fix protocol version for overspecifications > - t5700: only run with protocol version 1 > - t5512: compensate for v0 only sending HE

Re: [PATCH 2/8] tests: always test fetch of unreachable with v0

2019-02-14 Thread Jonathan Tan
> On Tue, Feb 05, 2019 at 04:21:16PM -0800, Jonathan Tan wrote: > > > Some tests check that fetching an unreachable object fails, but protocol > > v2 allows such fetches. Unset GIT_TEST_PROTOCOL_VERSION so that these > > tests are always run using protocol v0. > > I think this is reasonable, but

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results)

2019-02-14 Thread Junio C Hamano
"Randall S. Becker" writes: > On February 13, 2019 22:33, Junio C Hamano wrote: >> A release candidate Git v2.21.0-rc1 is now available for testing at the usual >> places. It is comprised of 464 non-merge commits since v2.20.0, contributed >> by 60 people, 14 of which are new faces. > > We are c

Re: [PATCH] diff: reuse diff setup for --no-index case

2019-02-14 Thread Junio C Hamano
Jeff King writes: > Subject: [PATCH] diff: reuse diff setup for --no-index case > > When "--no-index" is in effect (or implied by the arguments), git-diff > jumps early to a special code path to perform that diff. This means we > miss out on some settings like enabling --ext-diff and --textconv b

[PATCH 4/5] remote-curl: refactor reading into rpc_state's buf

2019-02-14 Thread Jonathan Tan
Currently, whenever remote-curl reads pkt-lines from its response file descriptor, only the payload is written to its buf, not the 4 characters denoting the length. A future patch will require the ability to also write those 4 characters, so in preparation for that, refactor this read into its own

[PATCH 1/5] remote-curl: reduce scope of rpc_state.argv

2019-02-14 Thread Jonathan Tan
The argv field in struct rpc_state is only used in rpc_service(), and not in any functions it directly or indirectly calls. Refactor it to become an argument of rpc_service() instead. Signed-off-by: Jonathan Tan --- remote-curl.c | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-)

[PATCH 3/5] remote-curl: reduce scope of rpc_state.result

2019-02-14 Thread Jonathan Tan
The result field in struct rpc_state is only used in rpc_service(), and not in any functions it directly or indirectly calls. Refactor it to become an argument of rpc_service() instead. Signed-off-by: Jonathan Tan --- remote-curl.c | 25 + 1 file changed, 13 insertions(+)

[PATCH 5/5] remote-curl: use post_rpc() for protocol v2 also

2019-02-14 Thread Jonathan Tan
When transmitting and receiving POSTs for protocol v0 and v1, remote-curl uses post_rpc() (and associated functions), but when doing the same for protocol v2, it uses a separate set of functions (proxy_rpc() and others). Besides duplication of code, this has caused at least one bug: the auth retry

[PATCH 2/5] remote-curl: reduce scope of rpc_state.stdin_preamble

2019-02-14 Thread Jonathan Tan
The stdin_preamble field in struct rpc_state is only used in rpc_service(), and not in any functions it directly or indirectly calls. Refactor it to become an argument of rpc_service() instead. An observation of all callers of rpc_service() shows that the preamble is always set, so we no longer ne

[PATCH 0/5] Protocol v2 fix: http and auth

2019-02-14 Thread Jonathan Tan
Peff noticed an issue with my http auth in protocol v2 patch earlier [1], and in the ensuing discussion, I thought that it would be best to make v2 use post_rpc() as well (to be the same as v0/v1) instead of using its own functions, to fix this issue and try to avoid a similar issue in the future.

Re: [PATCH] doc: format pathnames and URLs as monospace

2019-02-14 Thread Eric Sunshine
On Thu, Feb 14, 2019 at 11:32 AM Corentin BOMPARD wrote: > diff --git a/Documentation/technical/pack-protocol.txt > b/Documentation/technical/pack-protocol.txt > @@ -107,7 +107,7 @@ Initiating the upload-pack or receive-pack processes over > SSH is > It is basically equivalent to running this:

Re: [Bug report] git diff stat shows unrelated diff

2019-02-14 Thread Johannes Sixt
Am 14.02.19 um 09:22 schrieb Viresh Kumar: > Hello, > > I am not sure if it is a bug or not, but the output I got wasn't what > I was looking for. And so looking for some help. I was looking to send > pull request [1] to PM maintainer and was generating the request > against his tree [2], which al

Re: [PATCH v6 2/2] config: allow giving separate author and committer idents

2019-02-14 Thread William Hubbs
On Wed, Feb 13, 2019 at 02:37:48PM -0800, Junio C Hamano wrote: > William Hubbs writes: > > > I am writing back onn this thread because I'm not quite sure of the > > status. v5 of the patch seemed ok, but there were some changes discussed > > that would have created a v6. The v6 changes though we

Re: [PATCH v2 3/3] submodule: document default behavior

2019-02-14 Thread Junio C Hamano
Denton Liu writes: >> > +With no arguments, the default command is 'status'. Several subcommands >> > are >> > +available to perform operations on the submodules. >> >> I am not sure if "default is status" is really true. >> >>$ git submodule status --recursive >>$ git submodule --recur

Re: [PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.

2019-02-14 Thread Elijah Newren
On Thu, Feb 14, 2019 at 7:55 AM Emilio Cobos Álvarez wrote: > > The --autosquash option is implied by the earlier --[no-]autosquash > entry in the list. > > Signed-off-by: Emilio Cobos Álvarez > --- > Documentation/git-rebase.txt | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/Documentat

[PATCH] doc: format pathnames and URLs as monospace

2019-02-14 Thread Corentin BOMPARD
Signed-off-by: Corentin BOMPARD --- Documentation/SubmittingPatches| 6 ++-- Documentation/config/checkout.txt | 2 +- Documentation/config/core.txt | 14 Documentation/config/log.txt | 4 +-- Documentatio

Re: [PATCH v2] read-cache: add post-indexchanged hook

2019-02-14 Thread Ramsay Jones
On 14/02/2019 14:42, Ben Peart wrote: > From: Ben Peart > > Add a post-indexchanged hook that is invoked after the index is written in s/post-indexchanged/post-index-changed/ > do_write_locked_index(). > > This hook is meant primarily for notification, and cannot affect > the outcome of git

Re: [PATCH] rebase: fix regression in rebase.useBuiltin=false test mode

2019-02-14 Thread Phillip Wood
Hi Ævar On 13/02/2019 21:49, Ævar Arnfjörð Bjarmason wrote: Fix a recently introduced regression in c762aada1a ("rebase -x: sanity check command", 2019-01-29) triggered when running the tests with GIT_TEST_REBASE_USE_BUILTIN=false. See 62c23938fa ("tests: add a special setup where rebase.useBuil

[PATCH v3 5/5] blame: add tests for ignoring revisions

2019-02-14 Thread Barret Rhoden
Signed-off-by: Barret Rhoden --- This removes the spaces after redirects and gets rid of sed -i. I can roll a v4 of the whole patch set if you'd like. o/w I'll wait for more changes in the other patches. Thanks, Barret t/t8013-blame-ignore-revs.sh | 199 +++

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results)

2019-02-14 Thread Randall S. Becker
On February 13, 2019 22:33, Junio C Hamano wrote: > A release candidate Git v2.21.0-rc1 is now available for testing at the usual > places. It is comprised of 464 non-merge commits since v2.20.0, contributed > by 60 people, 14 of which are new faces. We are currently running through a full regres

[PATCH v2] read-cache: add post-indexchanged hook

2019-02-14 Thread Ben Peart
From: Ben Peart Add a post-indexchanged hook that is invoked after the index is written in do_write_locked_index(). This hook is meant primarily for notification, and cannot affect the outcome of git commands that trigger the index write. The hook is passed a flag to indicate whether the workin

BUG: 2.11-era rebase regression when @{upstream} is implicitly used

2019-02-14 Thread Ævar Arnfjörð Bjarmason
This is not a 2.21 release issue, and pre-dates the built-in rebase. When you clone any repository, e.g. git.git, and add one commit on top of the cloned branch, then run "git rebase" you'll get e.g.: $ git rebase First, rewinding head to replay your work on top of it... Applying: foo

Re: Git - logo commercial use

2019-02-14 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 13 2019, Agnieszka Borcz wrote: > Dear Sir/Madam, > > My partner and I are in the initial stages of setting up an e-commerce > business selling high-quality stickers of logos of popular software and > libraries. We would mainly be marketing towards software developers, as there >

Re: [PATCH v6 00/15] Trace2 tracing facility

2019-02-14 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 06 2019, Jeff Hostetler via GitGitGadget wrote: > V6 addresses: [] The remaining hdr-check warning in trace2/tr2_tls.h > > There are no other outstanding comments that I'm aware of. Not a comment on this, just a follow-up question. I started looking into whether this could be driven

Re: [PATCH 1/3] prune: lazily perform reachability traversal

2019-02-14 Thread Jeff King
On Thu, Feb 14, 2019 at 05:54:25AM -0500, Eric Sunshine wrote: > On Wed, Feb 13, 2019 at 11:35 PM Jeff King wrote: > > diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh > > @@ -274,6 +274,18 @@ test_expect_success 'prune .git/shallow' ' > > +test_expect_success 'prune .git/shallow when there are n

Re: [PATCH 1/3] prune: lazily perform reachability traversal

2019-02-14 Thread Eric Sunshine
On Wed, Feb 13, 2019 at 11:35 PM Jeff King wrote: > diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh > @@ -274,6 +274,18 @@ test_expect_success 'prune .git/shallow' ' > +test_expect_success 'prune .git/shallow when there are no loose objects' ' > + SHA1=$(echo hi|git commit-tree HEAD^{tree})

Re: [PATCH] read-cache.c: index format v5 -- 30% smaller/faster than v4

2019-02-14 Thread Duy Nguyen
On Thu, Feb 14, 2019 at 5:02 PM Ævar Arnfjörð Bjarmason wrote: > > Take a look at stat data, st_dev, st_uid, st_gid and st_mode are the > > same most of the time. ctime should often be the same (or differs just > > slightly). And sometimes mtime is the same as well. st_ino is also > > always zero

Re: [PATCH] read-cache.c: index format v5 -- 30% smaller/faster than v4

2019-02-14 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 13 2019, Nguyễn Thái Ngọc Duy wrote: > Index file size more or less translates to write time because we hash > the entire file every time we update the index. And we update the index > quite often (automatically index refresh is done everywhere). This means > smaller index files are

Re: [PATCH v2] tests: avoid syntax triggering old dash bug

2019-02-14 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 13 2019, SZEDER Gábor wrote: > On Wed, Feb 13, 2019 at 12:59:51PM +0100, Ævar Arnfjörð Bjarmason wrote: >> Avoid a bug in dash that's been fixed ever since its >> ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first >> released with dash v0.5.7 in July 2011. This fail

Re: GSoC 2019: Git's application submitted

2019-02-14 Thread Christian Couder
On Wed, Feb 13, 2019 at 11:37 PM Elijah Newren wrote: > > I'm a little hesitant to suggest this as I'm not sure how available I > could be for mentoring and don't view myself as a good mentor, but > another project idea which has lots of sub-pieces and thus could show > progress and be useful even

[Bug report] git diff stat shows unrelated diff

2019-02-14 Thread Viresh Kumar
Hello, I am not sure if it is a bug or not, but the output I got wasn't what I was looking for. And so looking for some help. I was looking to send pull request [1] to PM maintainer and was generating the request against his tree [2], which already has kernel upto v5.0-rc6 merged in it. These are