Re: [PATCH 19/29] refs: don't dereference on rename

On 04/30/2016 01:21 AM, David Turner wrote: > On Fri, 2016-04-29 at 09:38 +0200, Michael Haggerty wrote: >> On 04/27/2016 08:55 PM, Junio C Hamano wrote: >>> Michael Haggerty writes: >>> @@ -2380,8 +2381,8 @@ int rename_ref(const char *oldrefname, const char

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Fri, Apr 29, 2016 at 03:35:54PM -0700, Stefan Beller wrote: > > -- >8 -- > > diff: enable "compaction heuristics" and lose experimentation knob > > > > It seems that the new "find a good hunk boundary by locating a blank > > line" heuristics gives much more pleasant result without much > >

Re: using git-difftool -d when cherry-picking

On Wed, Apr 27, 2016 at 11:12:25AM +0200, Jan Smets wrote: > Hi > > Please consider following example > > #!/bin/bash > rm -rf /tmp/gittest > mkdir /tmp/gittest > cd /tmp/gittest > > git init > > echo $RANDOM > testfile > git add testfile > git commit -m test -a > > git branch X > git

Re: [PATCH 02/14] upload-pack.c: Refactor capability advertising

On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote: > Instead of having the capabilities in a local string, keep them > in a struct outside the function. This will allow us in a later patch nit: s/struct/array/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of

[PATCH v7 14/19] index-helper: kill mode

Add a new command (and command-line arg) to allow index-helpers to exit cleanly. This is mainly useful for tests. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 31 ++-

[PATCH v7 03/19] index-helper: new daemon for caching index and related stuff

From: Nguyễn Thái Ngọc Duy Instead of reading the index from disk and worrying about disk corruption, the index is cached in memory (memory bit-flips happen too, but hopefully less often). The result is faster read. Read time is reduced by 70%. The biggest gain is not having

[PATCH v7 06/19] daemonize(): set a flag before exiting the main process

From: Nguyễn Thái Ngọc Duy This allows signal handlers and atexit functions to realize this situation and not clean up. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- builtin/gc.c | 2 +- cache.h | 2 +-

[PATCH v7 17/19] index-helper: optionally automatically run

Introduce a new config option, indexhelper.autorun, to automatically run git index-helper before starting up a builtin git command. This enables users to keep index-helper running without manual intervention. Signed-off-by: David Turner --- Documentation/config.txt |

[PATCH v7 07/19] index-helper: add --detach

From: Nguyễn Thái Ngọc Duy We detach after creating and opening the socket, because otherwise we might return control to the shell before index-helper is ready to accept commands. This might lead to flaky tests. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v7 10/19] index-helper: use watchman to avoid refreshing index with lstat()

From: Nguyễn Thái Ngọc Duy Watchman is hidden behind index-helper. Before git tries to read the index from shm, it notifies index-helper through the socket and waits for index-helper to prepare a file for sharing memory (with MAP_SHARED). index-helper then contacts watchman,

[PATCH v7 09/19] Add watchman support to reduce index refresh cost

From: Nguyễn Thái Ngọc Duy The previous patch has the logic to clear bits in 'WAMA' bitmap. This patch has logic to set bits as told by watchman. The missing bit, _using_ these bits, are not here yet. A lot of this code is written by David Turner originally, mostly from [1].

[PATCH v7 19/19] untracked-cache: config option

Add a config option to populate the untracked cache. For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner --- Documentation/config.txt | 4

[PATCH v7 11/19] update-index: enable/disable watchman support

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ Documentation/git-update-index.txt | 6 ++ builtin/update-index.c | 16

[PATCH v7 16/19] index-helper: autorun mode

Soon, we'll want to automatically start index-helper, so we need a mode that silently exits if it can't start up (either because it's not in a git dir, or because another one is already running). Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 4

[PATCH v7 18/19] Add tracing to measure where most of the time is spent

From: Nguyễn Thái Ngọc Duy All the known heavy code blocks are measured (except object database access). This should help identify if an optimization is effective or not. An unoptimized git-status would give something like below (92% of time is accounted). To sum up the effort

[PATCH v7 08/19] read-cache: add watchman 'WAMA' extension

From: Nguyễn Thái Ngọc Duy The extension contains a bitmap, one bit for each entry in the index. If the n-th bit is zero, the n-th entry is considered unchanged, we can ce_mark_uptodate() it without refreshing. If the bit is non-zero and we found out the corresponding file is

[PATCH v7 05/19] index-helper: log warnings

Instead of writing warnings to stderr, write them to a log. Later, we'll probably be daemonized, so writing to stderr will be pointless. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 32

[PATCH v7 15/19] index-helper: don't run if already running

Signed-off-by: David Turner --- index-helper.c | 7 +++ t/t7900-index-helper.sh | 9 + 2 files changed, 16 insertions(+) diff --git a/index-helper.c b/index-helper.c index 9ca2ca6..e8d1311 100644 --- a/index-helper.c +++ b/index-helper.c @@ -455,6

[PATCH v7 13/19] watchman: add a config option to enable the extension

For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner --- .gitignore| 1 + Documentation/config.txt | 4 Makefile

[PATCH v7 12/19] unpack-trees: preserve index extensions

Make git checkout (and other unpack_tree operations) preserve the untracked cache and watchman status. This is valuable for two reasons: 1. Often, an unpack_tree operation will not touch large parts of the working tree, and thus most of the untracked cache will continue to be valid. 2. Even if

[PATCH v7 04/19] index-helper: add --strict

From: Nguyễn Thái Ngọc Duy There are "holes" in the index-helper approach because the shared memory is not verified again by git. If $USER is compromised, shared memory could be modified. But anyone who could do this could already modify $GIT_DIR/index. A more realistic risk

[PATCH v7 02/19] read-cache: allow to keep mmap'd memory after reading

From: Nguyễn Thái Ngọc Duy Later, we will introduce git index-helper to share this memory with other git processes. We only unmap it when we discard the index (although the kernel may of course choose to page it out). Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v7 01/19] read-cache.c: fix constness of verify_hdr()

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index d9fb78b..16cc487

[PATCH v7 00/19] index-helper/watchman

This version addresses Junio's comments on v6 -- primarily on 03/19, but with spillover to 05/19 and 10/19. * Added some docs on struct fields * Misc doc and commit message cleanups * Replaced select with poll * Removed some parameters from shared_mmap_create * Slight error handling improvement

Re: What's cooking in git.git (Apr 2016, #08; Fri, 29)

Hi, Junio On Fri, Apr 29, 2016 at 03:04:58PM -0700, Junio C Hamano wrote: >* xy/format-patch-base (2016-04-26) 4 commits > - format-patch: introduce format.useAutoBase configuration > - format-patch: introduce --base=auto option > - format-patch: add '--base' option to record base tree info > -

[PATCH 09/10] submodule sync: send messages to stderr

Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines. This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. Signed-off-by: Stefan Beller

[PATCH 06/10] submodule deinit: send messages to stderr

Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines. This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. Signed-off-by: Stefan Beller

[PATCH 03/10] submodule init: redirect stdout to stderr

Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines. We want to init submodules from the helper for `submodule update` in a later patch and the stdout output of said helper is consumed by the parts of `submodule update` which are still written

[PATCH 05/10] submodule add: send messages to stderr

Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines. This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. Signed-off-by: Stefan Beller

[PATCH 08/10] submodule update: send messages to stderr

Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines. This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. Signed-off-by: Stefan Beller

[PATCH 10/10] submodule deinit: complain when given a file instead of a submodule

This also improves performance for listing submodules, because S_ISGITLINK is both faster as match_pathspec as well as expected to be true in fewer cases, so putting it first in the condition will speed up the loop to compute all submodules. As this partially reverts 84ba959bbdf0 (submodule: fix

[PATCH 07/10] submodule foreach: send messages to stderr

Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines. This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. Signed-off-by: Stefan Beller

[PATCH 02/10] submodule deinit: lose requirement for giving '.'

The discussion in [1] realized that '.' is a faulty suggestion as there is a corner case where it fails: > "submodule deinit ." may have "worked" in the sense that you would > have at least one path in your tree and avoided this "nothing > matches" most of the time. It would have still failed

[PATCH 01/10] submodule deinit test: fix broken && chain in subshell

Signed-off-by: Stefan Beller --- t/t7400-submodule-basic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 814ee63..90d80d3 100755 --- a/t/t7400-submodule-basic.sh +++

[PATCH 04/10] shell helpers usage: always send help to stderr

`git submodule asdf` would trigger displaying the usage of the submodule command on stderr, however `git submodule -h` would display the usage on stdout. Unify displaying help for shell commands on stderr. Signed-off-by: Stefan Beller --- git-sh-setup.sh | 2 +- 1 file

[PATCH 00/10] submodule output patches

Patch 1 was send outside of a series already. Patch 2 and 3 are preparatory things for the submodule groups stuff patches 4-9 are making the output of the submodule command consistent (similar to patch 3, but I do not foresee a need for it yet) Patch 10 is a controversial thing I'd assume as it

[PATCH] submodule deinit test: fix broken && chain in subshell

Signed-off-by: Stefan Beller --- This was missed in 84ba959bbd, submodule: fix regression for deinit without submodules, 2016-03-22 Thanks, Stefan t/t7400-submodule-basic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH 07/14] fetch-pack: move capability selection out of do_fetch_pack

Later in version 2 of the pack protocol the selection of capabilities happens at another step of the protocol, so move out the current capability selection, so we can reuse it later more easily. Signed-off-by: Stefan Beller --- fetch-pack.c | 28 +---

[PATCH 06/14] remote.h: add get_remote_capabilities, request_capabilities

Instead of calling get_remote_heads as a first command during the protocol exchange, we need to have fine grained control over the capability negotiation in version 2 of the protocol. Introduce get_remote_capabilities, which will just listen to capabilities of the remote and request_capabilities

[PATCH 04/14] connect: rewrite feature parsing to work on string_list

Later on when we introduce the version 2 transport protocol, the capabilities will not be transported in one lone string but each capability will be carried in its own pkt line. To reuse existing infrastructure we would either need to join the capabilities into a single string again later or

[PATCH 12/14] Add test for fetch-pack

Signed-off-by: Stefan Beller --- t/t5500-fetch-pack.sh | 21 + 1 file changed, 21 insertions(+) diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 91a69fc..2c704ef 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -519,6

[PATCH 14/14] WIP test git fetch

Signed-off-by: Stefan Beller --- t/t5510-fetch.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 38321d1..ab5d3da 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -687,4 +687,9 @@ test_expect_success 'fetching with

[PATCH 08/14] fetch-pack: factor out get_selected_capabilities_list

This will be used later by both versions of the transport protocol. Signed-off-by: Stefan Beller --- fetch-pack.c | 51 --- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index

[PATCH 10/14] do_fetch_pack: select capabilities for transport version 1 only

`select_capabilities` would set local variables depending on the user selection provided by `args` and the server advertisement which is kept in a list in connect.c When talking pack protocol version 2 however this has already happend before during 'negotiate_capabilities' Signed-off-by: Stefan

[PATCH 02/14] upload-pack.c: Refactor capability advertising

Instead of having the capabilities in a local string, keep them in a struct outside the function. This will allow us in a later patch to easily reuse the capabilities in version 2 of the protocol. Signed-off-by: Stefan Beller --- upload-pack.c | 59

[PATCH 11/14] builtin/fetch-pack: add argument for transport version

Signed-off-by: Stefan Beller --- builtin/fetch-pack.c | 20 +++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index bfd0be4..afb614b 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@

[PATCH 01/14] upload-pack: make client capability parsing code a separate function

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Stefan Beller --- upload-pack.c | 44 +++- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git

[PATCH 05/14] transport: add infrastructure to support a protocol version number

Signed-off-by: Stefan Beller --- fetch-pack.h | 1 + remote.c | 2 ++ remote.h | 2 ++ transport-helper.c | 1 + transport.c| 20 ++-- transport.h| 8 6 files changed, 32 insertions(+), 2 deletions(-)

[PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack

In upload-pack-2 we send each capability in its own packet buffer. The construction of upload-pack-2 is a bit unfortunate as I would like it to not be depending on a symlink linking to upload-pack.c, but I did not find another easy way to do it. I would like it to generate upload-pack-2.o from

[PATCH 13/14] WIP add test for git pull

Signed-off-by: Stefan Beller --- t/t5520-pull.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 739c089..9bd1feb 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -599,4 +599,10 @@ test_expect_success 'git pull --rebase

[PATCH 09/14] fetch-pack: Add negotiate_capabilities

As in the pack protocol version 2 we want to negotiate the capabilities before any other exchange we will have a function which will take care of the whole negotiation process. It will be placed in fetch-pack.c for now as there we have access to its internal variables and we'll work on a `struct

Re: [PATCH 19/29] refs: don't dereference on rename

On Fri, 2016-04-29 at 09:38 +0200, Michael Haggerty wrote: > On 04/27/2016 08:55 PM, Junio C Hamano wrote: > > Michael Haggerty writes: > > > > > @@ -2380,8 +2381,8 @@ int rename_ref(const char *oldrefname, > > > const char *newrefname, const char *logms > > >

Re: [PATCH 25/29] refs: resolve symbolic refs first

On Fri, 2016-04-29 at 11:51 +0200, Michael Haggerty wrote: > On 04/29/2016 01:40 AM, David Turner wrote: > > On Wed, 2016-04-27 at 18:57 +0200, Michael Haggerty wrote: > > +retry: > > ... > > > + if (--attempts_remaining > 0) > > > + goto retry; > > > > could this be a

Re: [PATCH/RFC 4/6] transport: add refspec list parameters to functions

On Fri, Apr 29, 2016 at 4:05 PM, David Turner wrote: > On Tue, 2016-04-26 at 20:59 -0700, Stefan Beller wrote: >> On Mon, Apr 25, 2016 at 3:10 PM, Stefan Beller >> wrote: >> > On Mon, Apr 25, 2016 at 9:44 AM, David Turner < >> >

Re: [PATCH/RFC 4/6] transport: add refspec list parameters to functions

On Tue, 2016-04-26 at 20:59 -0700, Stefan Beller wrote: > On Mon, Apr 25, 2016 at 3:10 PM, Stefan Beller > wrote: > > On Mon, Apr 25, 2016 at 9:44 AM, David Turner < > > dtur...@twopensource.com> wrote: > > > On Wed, 2016-04-20 at 16:57 -0400, Jeff King wrote: > > > > On Wed,

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Fri, 2016-04-29 at 15:44 -0700, Stefan Beller wrote: > > > > Currently it's an "opt in" knob, so this doesn't make sense to me. > +static int diff_compaction_heuristic = 1; > Oops didn't know we'd made it default at some point. (all my versions had it disabled by default) > It's rather an

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

> Currently it's an "opt in" knob, so this doesn't make sense to me. +static int diff_compaction_heuristic = 1; It's rather an opt-out knob going by the current origin/jk/diff-compact-heuristic > If > we remove the entire knob as is, we can always (fairly easily) add it > back. I would keep

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Fri, 2016-04-29 at 15:35 -0700, Stefan Beller wrote: > On Fri, Apr 29, 2016 at 3:18 PM, Junio C Hamano > wrote: > > > > Jacob Keller writes: > > > > > > > > On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano > > m> wrote: > > > >

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Fri, Apr 29, 2016 at 3:18 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano wrote: >>> Jeff King writes: >>> ... Having the two directly next to each other

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

Jacob Keller writes: > On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano wrote: >> Jeff King writes: >> >>> ... Having the two directly next to each other reads >>> better to me. This is a pretty unusual diff, though, in that it did >>>

What's cooking in git.git (Apr 2016, #08; Fri, 29)

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 integration branches, but I am still holding onto them. The 'master' branch now has the

A note from the maintainer

Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

[ANNOUNCE] Git v2.8.2

The latest maintenance release Git v2.8.2 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.8.2' tag and the 'maint' branch that the tag points at: url =

Re: [PATCH v8 10/10] ce_compare_data() did not respect conversion

tbo...@web.de writes: > From: Torsten Bögershausen > > We define the working tree file is clean if either: > > * the result of running convert_to_git() on the working tree > contents matches what is in the index (because that would mean > doing another "git add" on the

Re: [PATCH v2] travis-ci: build documentation

Lars Schneider writes: >> This could be less of maintenance if we'd check with a "larger as" operator >> such as >> >>test_file_count_more_than html 200 >> >> using an arbitrary slightly smaller number. > > Well, I was thinking about testing against something like

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano wrote: > Jeff King writes: > >> ... Having the two directly next to each other reads >> better to me. This is a pretty unusual diff, though, in that it did >> change the surrounding whitespace (and if you look

Re: [PATCH v6 03/19] index-helper: new daemon for caching index and related stuff

David Turner writes: > Per working tree/repository, yes (not quite per-index because working > trees with split indexes have two). Heh, I consider "split index" merely an implementation detail of a (logical) single index file that happens to be represented with two

Re: [PATCHv1] git-p4: workaround p4 removal of client directory

[+Git, Junio] On 29 April 2016 at 15:10, Jacob Smith wrote: > That's the identical patch I'm maintaining internally; it appears to work. Thanks, I think that counts as a "Tested-by" then. Luke > > Sent from my iPhone > >> On Apr 29, 2016, at 8:52 AM, Luke Diamand

Re: [PATCH v2] travis-ci: build documentation

On 29 Apr 2016, at 19:27, Stefan Beller wrote: > On Fri, Apr 29, 2016 at 5:21 AM, Matthieu Moy > wrote: >> Jeff King writes: >> >>> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote: >>> +# The

Re: [PATCH] t9824: fix wrong reference value

On 29 April 2016 at 21:29, Lars Schneider wrote: > > On 29 Apr 2016, at 19:34, Junio C Hamano wrote: > >> Lars Schneider writes: >> >>> 0492eb4 fixed a broken &&-chain in this test which broke the test as it >>> checked for

Re: [PATCH] t9824: fix wrong reference value

On 29 Apr 2016, at 19:34, Junio C Hamano wrote: > Lars Schneider writes: > >> 0492eb4 fixed a broken &&-chain in this test which broke the test as it >> checked for a wrong size. The expected size of the file under test is >> 39 bytes. The test

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

Jeff King writes: > ... Having the two directly next to each other reads > better to me. This is a pretty unusual diff, though, in that it did > change the surrounding whitespace (and if you look further in the diff, > the identical change is made elsewhere _without_ touching the

Re: [RFC PATCH 2/3] connect: group CONNECT_DIAG_URL handling code

On 29.04.16 02:43, Mike Hommey wrote: > get_host_and_port(_host, ); > + if (!port) > + port = get_port(ssh_host); I'm not sure, if this is an improvement or not. The original intention was, to check what the parser did, before going out to the

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

On Fri, Apr 29, 2016 at 11:37 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> We do not need to do anything special to initialize the `submodule_groups` >> pointer as the diff options setup will fill in 0 by default. >> >> Signed-off-by: Stefan

Re: [PATCH v6 03/19] index-helper: new daemon for caching index and related stuff

On Thu, 2016-04-28 at 11:58 -0700, Junio C Hamano wrote: > David Turner writes: > > > From: Nguyễn Thái Ngọc Duy > > ... > > The biggest gain is not having to verify the trailing SHA-1, which > > takes lots of time especially on large index files.

Re: [PATCH 12/15] git submodule summary respects groups

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- Same comment as 11/15 applies here. > git-submodule.sh | 5 + > t/t7413-submodule--helper.sh | 26 ++ > 2 files changed, 31 insertions(+) > > diff --git

Re: [PATCH 06/15] submodule init: redirect stdout to stderr

On Fri, Apr 29, 2016 at 11:27 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Reroute the output of stdout to stderr as it is just informative >> messages, not to be consumed by machines. >> >> We want to init submodules from the helper for

Re: [PATCH 11/15] diff: ignore submodules excluded by groups

Stefan Beller writes: > We do not need to do anything special to initialize the `submodule_groups` > pointer as the diff options setup will fill in 0 by default. > > Signed-off-by: Stefan Beller > --- > diff.c | 3 +++ > diff.h | 1 + > 2 files changed,

Re: [PATCH 08/15] submodule--helper list: respect submodule groups

Stefan Beller writes: > As submodule--helper list is the building block for some submodule > commands (foreach, deinit, status, sync), also add tests for those. The title is slightly misleading, isn't it? This step only teaches the commands to limit the operation to the

Re: [PATCH 07/15] submodule deinit: loose requirement for giving '.'

Stefan Beller writes: > This is needed later to make a distinction between 'all specified' > and the default group of submodules. s/loose/lose/; Again, this can be separated as an independent preliminary clean-up. > > Signed-off-by: Stefan Beller >

Re: [PATCH 06/15] submodule init: redirect stdout to stderr

Stefan Beller writes: > Reroute the output of stdout to stderr as it is just informative > messages, not to be consumed by machines. > > We want to init submodules from the helper for `submodule update` > in a later patch and the stdout output of said helper is consumed > by

Re: [PATCH v8 10/10] ce_compare_data() did not respect conversion

tbo...@web.de writes: > From: Torsten Bögershausen > > We define the working tree file is clean if either: > > * the result of running convert_to_git() on the working tree > contents matches what is in the index (because that would mean > doing another "git add" on the

Re: [PATCH 2/2] http: expand http.cookieFile as a path

On Fri, Apr 29, 2016 at 10:55:00AM -0700, Junio C Hamano wrote: > Thanks. Perhaps squash this to the patch in the message you are > responding to. > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index ff7eaaf..786e0fa 100644 > --- a/Documentation/config.txt > +++

Re: [PATCH 2/2] http: expand http.cookieFile as a path

Jeff King writes: > On Fri, Apr 29, 2016 at 10:48:16AM -0700, Junio C Hamano wrote: > >> Brian Norris writes: >> >> > I mostly just copied from boilerplate on another option. IIRC, there >> > were at least two other options that were documented

Re: [PATCH v2] travis-ci: build documentation

Stefan Beller writes: > On Fri, Apr 29, 2016 at 5:21 AM, Matthieu Moy > wrote: >> Jeff King writes: >> >>> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote: >>> +# The follow numbers need to be

Re: [PATCH 2/2] http: expand http.cookieFile as a path

Junio C Hamano writes: > Brian Norris writes: > >> I mostly just copied from boilerplate on another option. IIRC, there >> were at least two other options that were documented similarly. > > My quick grep didn't find 'another option' other than

Re: [PATCH 2/2] http: expand http.cookieFile as a path

On Fri, Apr 29, 2016 at 10:48:16AM -0700, Junio C Hamano wrote: > Brian Norris writes: > > > I mostly just copied from boilerplate on another option. IIRC, there > > were at least two other options that were documented similarly. > > My quick grep didn't find

Re: [PATCH 2/2] http: expand http.cookieFile as a path

Brian Norris writes: > I mostly just copied from boilerplate on another option. IIRC, there > were at least two other options that were documented similarly. My quick grep didn't find 'another option' other than include.path, but how about this as a preparatory

Re: [PATCH] t9824: fix wrong reference value

Lars Schneider writes: > 0492eb4 fixed a broken &&-chain in this test which broke the test as it > checked for a wrong size. The expected size of the file under test is > 39 bytes. The test checked that the size is 13 bytes. Fix the reference > value to make the test

Re: [PATCH 2/2] http: expand http.cookieFile as a path

Jeff King writes: > Yeah, this is what I had in mind. My only reservation would be that we > need to make sure it is clear that this applies only to keys marked as > taking a "pathname" type in the documentation. I'm suspect there are > ones that are logically paths but do not

Re: [PATCH v2] travis-ci: build documentation

On Fri, Apr 29, 2016 at 5:21 AM, Matthieu Moy wrote: > Jeff King writes: > >> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote: >> >>> +# The follow numbers need to be adjusted when new documentation is added. >>>

Re: [PATCH 2/2] http: expand http.cookieFile as a path

On Fri, Apr 29, 2016 at 10:11:48AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I'm not sure if it's a good idea to go into so much detail about > > expand_user_path() here. There are a lot of options that use the same > > rules, and we probably don't want to go into a

Re: [RFC PATCH 2/3] connect: group CONNECT_DIAG_URL handling code

Junio C Hamano writes: > Mike Hommey writes: > >> Signed-off-by: Mike Hommey > > I feel that this commit is under-explained. I think you should feel > entitled to boast the goodness this brings to us louder in the log > message. > > It

Re: [PATCH 2/2] http: expand http.cookieFile as a path

Jeff King writes: > I'm not sure if it's a good idea to go into so much detail about > expand_user_path() here. There are a lot of options that use the same > rules, and we probably don't want to go into a complete explanation > inside each option's description. Is there a

Re: [PATCHv2 1/2] submodule init: fail gracefully with a missing .gitmodules file

Stefan Beller writes: > When there is no .gitmodules file availabe to initialize a submodule > from, `submodule_from_path` just returns NULL. We need to check for > that and abort gracefully. When `submodule init` was implemented in shell, > a missing .gitmodules file would

Re: Git 2.8.1 fails test 32 of t7300-clean.sh, breaks profile build

On Fri, Apr 29, 2016 at 5:53 AM, Jan Keromnes wrote: > Hello, > > I tried running a full profile build of Git 2.8.1, but it looks like > test #32 in `t7300-clean.sh` fails: > > Commands: > >> curl https://www.kernel.org/pub/software/scm/git/git-2.8.1.tar.xz | tar xJ >> cd

Re: [RFC PATCH 3/3] connect: move ssh command line preparation to a separate (public) function

Mike Hommey writes: > Signed-off-by: Mike Hommey > --- I think moving it out into a separate helper function is a very good change to make the end result easier to follow. Turning the helper to extern and adding it to connect.h does not benefit us (and

Re: [RFC PATCH 2/3] connect: group CONNECT_DIAG_URL handling code

Mike Hommey writes: > Signed-off-by: Mike Hommey I feel that this commit is under-explained. I think you should feel entitled to boast the goodness this brings to us louder in the log message. It bothers me somewhat that this ended up copying, not

[PATCH] t9824: fix wrong reference value

0492eb4 fixed a broken &&-chain in this test which broke the test as it checked for a wrong size. The expected size of the file under test is 39 bytes. The test checked that the size is 13 bytes. Fix the reference value to make the test pass, again. Signed-off-by: Lars Schneider

Re: [PATCH v5 2/2] submodule: pass on http.extraheader config settings

Hi Peff, On Fri, 29 Apr 2016, Jeff King wrote: > On Fri, Apr 29, 2016 at 02:48:44PM +0200, Johannes Schindelin wrote: > > > > If you know off-hand how to teach my vim to use your preferred indenting, > > > I'll gladly just brow-beat it into submission. > > > > For the record, I think the

  1   2   >