Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Daniels Umanovskis
On 10/11/18 8:54 AM, Junio C Hamano wrote: > Is it a normal situation to have refname==NULL, or is it something > worth reporting as an error? Looks like that would be in the case of looping symrefs or file backend failure, so seems a good idea to die() in that case. > Without passing the

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Rafael Ascensão
On Wed, Oct 10, 2018 at 08:34:40PM -0400, Jeff King wrote: > It just seems like in its current form it might be in an uncanny valley > where it is not quite scriptable plumbing, but not as informative as > other porcelain. I agree it feels a bit out of place, and still think that $ git

Re: [PATCH v3 7/7] revision.c: refactor basic topo-order logic

2018-10-11 Thread Derrick Stolee
On 10/11/2018 11:35 AM, Jeff King wrote: On Fri, Sep 21, 2018 at 10:39:36AM -0700, Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee When running a command like 'git rev-list --topo-order HEAD', Git performed the following steps: [...] In the new algorithm, these three steps

Re: [PATCH v3 7/7] revision.c: refactor basic topo-order logic

2018-10-11 Thread Jeff King
On Fri, Sep 21, 2018 at 10:39:36AM -0700, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > When running a command like 'git rev-list --topo-order HEAD', > Git performed the following steps: > [...] > In the new algorithm, these three steps correspond to three > different commit

Re: [PATCH 08/15] sequencer: change complete_action() to use the refactored functions

2018-10-11 Thread Alban Gruin
Le 11/10/2018 à 15:51, Phillip Wood a écrit : > On 07/10/2018 20:54, Alban Gruin wrote: >> +    if (rewrite_file(todo_file, new_todo.buf.buf, new_todo.buf.len) < >> 0) { >> +    todo_list_release(_todo); >> +    return error_errno(_("could not write '%s'"), todo_file); >> +    } > >

Re: [PATCH 04/15] sequencer: refactor sequencer_add_exec_commands() to work on a todo_list

2018-10-11 Thread Alban Gruin
Hi Phillip, thanks for taking the time to review my patches. Le 11/10/2018 à 13:25, Phillip Wood a écrit : > On 07/10/2018 20:54, Alban Gruin wrote: >> @@ -4419,15 +4406,38 @@ int sequencer_add_exec_commands(const char >> *commands) >>   } >>     /* insert or append final */ >> -    if

Re: [PATCH 10/15] rebase-interactive: use todo_list_transform() in edit_todo_list()

2018-10-11 Thread Phillip Wood
On 07/10/2018 20:54, Alban Gruin wrote: Just like complete_action(), edit_todo_list() used a function (transform_todo_file()) that read the todo-list from the disk and wrote it back, resulting in useless disk accesses. This changes edit_todo_list() to call directly todo_list_transform()

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Daniels Umanovskis
On 10/11/18 5:43 PM, Rafael Ascensão wrote: > I agree it feels a bit out of place, and still think that > > $ git branch --list HEAD > > would be a good candidate to be taught how to print the current branch. I am not a fan because it would be yet another inconsistency in the Git command

[PATCH] Per-commit and per-parent filters for 2 parents

2018-10-11 Thread Jonathan Tan
Signed-off-by: Jonathan Tan --- > One main benefit of storing on Bloom filter per commit is to avoid > recomputing hashes at every commit. Currently, this patch only improves > locality when checking membership at the cost of taking up more space. > Drop the dependence on the parent oid and then

[PATCH v2 4/4] subtree: improve decision on merges kept in split

2018-10-11 Thread Roger Strain
From: "Strain, Roger L" When multiple identical parents are detected for a commit being considered for copying, explicitly check whether one is the common merge base between the commits. If so, the other commit can be used as the identical parent; if not, a merge must be performed to maintain

Re: [PATCH v3 1/2] commit-graph write: add progress output

2018-10-11 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Ævar Arnfjörð Bjarmason wrote: > On Wed, Oct 10 2018, SZEDER Gábor wrote: > >> On Wed, Oct 10, 2018 at 11:56:45PM +0200, Ævar Arnfjörð Bjarmason wrote: >>> On Wed, Oct 10 2018, SZEDER Gábor wrote: >> >>> >> for (i = 0; i < oids->nr; i++) { >>> >> +

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Jeff King
On Thu, Oct 11, 2018 at 06:36:02PM +0200, Daniels Umanovskis wrote: > On 10/11/18 5:43 PM, Rafael Ascensão wrote: > > I agree it feels a bit out of place, and still think that > > > > $ git branch --list HEAD > > > > would be a good candidate to be taught how to print the current branch. >

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Jeff King
On Thu, Oct 11, 2018 at 07:29:58PM +0200, Daniels Umanovskis wrote: > > Without passing the argument, I do not think there is a > > reliable way to ask resolve_ref_unsafe() if "HEAD" is a symbolic > > ref. > > If I'm reading the code correctly, resolve_ref_unsafe() will return > "HEAD" or NULL

[PATCH] doc: move git-get-tar-commit-id to plumbing

2018-10-11 Thread Daniels Umanovskis
This is definitely a low-level command, it's hard to argue against it belonging in plumbing. Signed-off-by: Daniels Umanovskis --- command-list.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command-list.txt b/command-list.txt index c36ea3c18..966705358 100644 ---

[PATCH v2 3/4] subtree: use commits before rejoins for splits

2018-10-11 Thread Roger Strain
From: "Strain, Roger L" Adds recursive evaluation of parent commits which were not part of the initial commit list when performing a split. Split expects all relevant commits to be reachable from the target commit but not reachable from any previous rejoins. However, a branch could be based on

[PATCH v2 0/4] Multiple subtree split fixes regarding complex repos

2018-10-11 Thread Roger Strain
After doing some testing at scale, determined that one call was taking too long; replaced that with an alternate call which returns the same data significantly faster. Also, if anyone has any other feedback on these I'd really love to hear it. It's working better for us (as in, it actually

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Daniels Umanovskis
On 10/11/18 10:35 PM, Rafael Ascensão wrote: > The output of the proposed command is also a bit inconsistent with the > usual output given by git branch, specifically the space alignment on > the left, color and * marker. The proposed command therefore takes a new switch. It's definitely not

[PATCH] doc: move git-cherry to plumbing

2018-10-11 Thread Daniels Umanovskis
Also remove git-cherry from Bash completion because plumbing commands do not belong there. Signed-off-by: Daniels Umanovskis --- Up to discussion whether cherry should be considered plumbing. I lean towards considering it a rarely-used porcelain command, but a case could be made either way so

[PATCH v2 1/4] subtree: refactor split of a commit into standalone method

2018-10-11 Thread Roger Strain
From: "Strain, Roger L" In a particularly complex repo, subtree split was not creating compatible splits for pushing back to a separate repo. Addressing one of the issues requires recursive handling of parent commits that were not initially considered by the algorithm. This commit makes no

[PATCH v2 2/4] subtree: make --ignore-joins pay attention to adds

2018-10-11 Thread Roger Strain
From: "Strain, Roger L" Changes the behavior of --ignore-joins to always consider a subtree add commit, and ignore only splits and squashes. The --ignore-joins option is documented to ignore prior --rejoin commits. However, it additionally ignored subtree add commits generated when a subtree

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Jeff King
On Thu, Oct 11, 2018 at 09:35:28PM +0100, Rafael Ascensão wrote: > On Thu, Oct 11, 2018 at 01:51:36PM -0400, Jeff King wrote: > > Yeah, I agree. > > Not sure which parts you meant, so I'll assume you didn't agree > with me. Correct. ;) I like your general idea, but I agree with Daniel that it

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Rafael Ascensão
On Thu, Oct 11, 2018 at 06:36:02PM +0200, Daniels Umanovskis wrote: > I am not a fan because it would be yet another inconsistency in the Git > command interface. The output of the proposed command is also a bit inconsistent with the usual output given by git branch, specifically the space

Re: [PATCH 10/15] rebase-interactive: use todo_list_transform() in edit_todo_list()

2018-10-11 Thread Alban Gruin
Le 11/10/2018 à 17:16, Phillip Wood a écrit : > On 07/10/2018 20:54, Alban Gruin wrote: >> Just like complete_action(), edit_todo_list() used a >> function (transform_todo_file()) that read the todo-list from the disk >> and wrote it back, resulting in useless disk accesses. >> >> This changes

[PATCH 18/19] submodule: don't add submodule as odb for push

2018-10-11 Thread Stefan Beller
The submodule was added as an alternative in eb21c732d6 (push: teach --recurse-submodules the on-demand option, 2012-03-29), but was not explained, why. In similar code, submodule_has_commits, the submodule is added as an alternative to perform a quick check if we need to dive into the submodule.

[PATCH 13/19] commit: prepare in_merge_bases[_many] to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c| 15 +-- commit.h| 8 ++-- contrib/coccinelle/the_repository.cocci | 17 + 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/commit.c

[PATCH 19/19] Apply semantic patches from previous patches

2018-10-11 Thread Stefan Beller
Previous commits added some cocci rules, but did not patch the whole tree, as to not dilute the focus for reviewing the previous patches. This patch is generated by 'make coccicheck' and applying the resulting diff, which was white space damaged (>8 spaces after a tab) in blame.c, which has been

[PATCH 01/19] sha1_file: allow read_object to read objects in arbitrary repositories

2018-10-11 Thread Stefan Beller
Allow read_object (a file local functon in sha1_file) to handle arbitrary repositories by passing the repository down to oid_object_info_extended. Signed-off-by: Stefan Beller --- sha1-file.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sha1-file.c

[RFC PATCH 00/19] Bring more repository handles into our code base

2018-10-11 Thread Stefan Beller
This applies on nd/the-index (b3c7eef9b05) and is the logical continuation of the object store series, which I sent over the last year. The previous series did take a very slow and pedantic approach, using a #define trick, see cfc62fc98c for details, but it turns out, that it doesn't work:

[PATCH 03/19] object-store: allow read_object_file_extended to read from arbitrary repositories

2018-10-11 Thread Stefan Beller
read_object_file_extended is not widely used, so migrate it all at once. Signed-off-by: Stefan Beller --- object-store.h | 5 +++-- sha1-file.c| 11 ++- streaming.c| 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/object-store.h b/object-store.h index

[PATCH 04/19] object-store: prepare read_object_file to deal with arbitrary repositories

2018-10-11 Thread Stefan Beller
As read_object_file is a widely used function (which is also regularly used in new code in flight between master..pu), changing its signature is painful is hard, as other series in flight rely on the original signature. It would burden the maintainer if we'd just change the signature. Introduce

[PATCH 06/19] commit: allow parse_commit* to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Just like the previous commit, parse_commit and friends are used a lot and are found in new patches, so we cannot change their signature easily. Re-introduce these function prefixed with 'repo_' that take a repository argument and keep the original as a shallow macro. Signed-off-by: Stefan

[PATCH 12/19] commit: prepare get_commit_buffer to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c| 8 +--- commit.h| 7 ++- contrib/coccinelle/the_repository.cocci | 7 +++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/commit.c b/commit.c index

[PATCH 08/19] commit.c: allow merge_bases_many to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/commit.c b/commit.c index f493a82f72..5e8791f0c1 100644 --- a/commit.c +++ b/commit.c @@ -934,7 +934,9 @@ static struct commit_list *paint_down_to_common(struct repository

[PATCH 10/19] commit: allow get_merge_bases_many_0 to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index f8a8844a72..b36c2aa0bf 100644 --- a/commit.c +++ b/commit.c @@ -1055,7 +1055,8 @@ static int remove_redundant(struct repository *r, struct commit

[PATCH 11/19] commit: prepare get_merge_bases to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Similarly to previous patches, the get_merge_base functions are used often in the code base, which makes migrating them hard. Implement the new functions, prefixed with 'repo_' and hide the old functions behind a wrapper macro. Signed-off-by: Stefan Beller --- commit.c

[PATCH 09/19] commit.c: allow remove_redundant to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/commit.c b/commit.c index 5e8791f0c1..f8a8844a72 100644 --- a/commit.c +++ b/commit.c @@ -995,7 +995,7 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in)

[PATCH 17/19] submodule: use submodule repos for object lookup

2018-10-11 Thread Stefan Beller
This converts the 'show_submodule_header' function to use the repository API properly, such that the submodule objects are not added to the main object store. Signed-off-by: Stefan Beller --- submodule.c | 48 ++-- 1 file changed, 38 insertions(+), 10

[PATCH 16/19] pretty: prepare format_commit_message to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- contrib/coccinelle/the_repository.cocci | 10 ++ pretty.c| 15 --- pretty.h| 7 ++- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git

[PATCH 02/19] packfile: allow has_packed_and_bad to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
has_packed_and_bad is not widely used, so just migrate it all at once. Signed-off-by: Stefan Beller --- packfile.c | 5 +++-- packfile.h | 2 +- sha1-file.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packfile.c b/packfile.c index ebcb5742ec..40085fe160 100644 ---

[PATCH 14/19] commit: prepare repo_unuse_commit_buffer to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c| 6 -- commit.h| 7 ++- contrib/coccinelle/the_repository.cocci | 8 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/commit.c b/commit.c index

[PATCH 15/19] commit: prepare logmsg_reencode to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.h| 8 contrib/coccinelle/the_repository.cocci | 9 + pretty.c| 13 +++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/commit.h b/commit.h index

[PATCH 07/19] commit.c: allow paint_down_to_common to handle arbitrary repositories

2018-10-11 Thread Stefan Beller
As the function is file local and not widely used, migrate it all at once. Signed-off-by: Stefan Beller --- commit.c | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index c6aeedc3d8..f493a82f72 100644 --- a/commit.c +++ b/commit.c @@

[PATCH 05/19] object: parse_object to honor its repository argument

2018-10-11 Thread Stefan Beller
In 8e4b0b6047 (object.c: allow parse_object to handle arbitrary repositories, 2018-06-28), we forgot to pass the repository down to the read_object_file. Signed-off-by: Stefan Beller --- object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/object.c b/object.c index

Re: [PATCH 05/19] object: parse_object to honor its repository argument

2018-10-11 Thread Jonathan Tan
> In 8e4b0b6047 (object.c: allow parse_object to handle > arbitrary repositories, 2018-06-28), we forgot to pass the > repository down to the read_object_file. [snip] > @@ -270,7 +270,7 @@ struct object *parse_object(struct repository *r, const > struct object_id *oid) > return

[PATCH v3] branch: introduce --show-current display option

2018-10-11 Thread Daniels Umanovskis
When called with --show-current, git branch will print the current branch name and terminate. Only the actual name gets printed, without refs/heads. In detached HEAD state, nothing is output. Intended both for scripting and interactive/informative use. Unlike git branch --list, no filtering is

Re: [PATCH 2/2] push: add an advice on unqualified push

2018-10-11 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Wed, Oct 10 2018, Jeff King wrote: > >> This is much better, and I love the customized behavior based on the >> object type. >> >> I wonder if we could reword the first paragraph to be a little less >> confusing, and spell out what we tried already. E.g.,

Re: [PATCH 1/3] ref-filter: free memory from used_atom

2018-10-11 Thread Junio C Hamano
Junio C Hamano writes: > Olga Telezhnaya writes: These three patches seem to cause t6300 to fail with an attempt to free an invalid pointer in "git for-each-ref --format='%(push)'" (6300.25) *** Error in `/home/gitster/w/git.git/git': free(): invalid pointer: 0x55cca3a9f920 *** ===

URGENT RESPONSE NEEDED

2018-10-11 Thread Sean Kim.
Hello my dear. Did you receive my email message to you? Please, get back to me ASAP as the matter is becoming late. Expecting your urgent response. Sean.

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread SZEDER Gábor
On Fri, Oct 12, 2018 at 12:53:26AM +0200, SZEDER Gábor wrote: > On Wed, Oct 10, 2018 at 10:54:32PM +0200, Daniels Umanovskis wrote: > > [...] > > > diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh > > index ee6787614..e9bc3b05f 100755 > > --- a/t/t3203-branch-output.sh > > +++

Re: [PATCH v8 0/7] speed up index load through parallelization

2018-10-11 Thread Junio C Hamano
Ben Peart writes: > From: Ben Peart > > Fixed issues identified in review the most impactful probably being plugging > some leaks and improved error handling. Also added better error messages > and some code cleanup to code I'd touched. > > The biggest change in the interdiff is the impact of

Re: [PATCH v4 0/3] alias help tweaks

2018-10-11 Thread Junio C Hamano
Rasmus Villemoes writes: > v2: Added patches 2 and 3, made "git cmd --help" unconditionally (no > config option, no delay) redirect to the aliased command's help, > preserve pre-existing behaviour of the spelling "git help cmd". > > v3: Add some additional comments in patch 1 and avoid

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-11 Thread Junio C Hamano
Phillip Wood writes: > On 10/10/2018 06:43, 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

Re: [PATCH 17/19] submodule: use submodule repos for object lookup

2018-10-11 Thread Jonathan Tan
> +/* > + * Initialize 'out' based on the provided submodule path. > + * > + * Unlike repo_submodule_init, this tolerates submodules not present > + * in .gitmodules. NEEDSWORK: The repo_submodule_init behavior is > + * preferrable. This function exists only to preserve historical behavior. What

Re: [RFC PATCH 00/19] Bring more repository handles into our code base

2018-10-11 Thread Jonathan Tan
> This series takes another approach as it doesn't change the signature of > functions, but introduces new functions that can deal with arbitrary > repositories, keeping the old function signature around using a shallow > wrapper. > > Additionally each patch adds a semantic patch, that would

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-11 Thread Stefan Beller
On Thu, Oct 11, 2018 at 3:41 PM Junio C Hamano wrote: > * After fixing ignore-any to one of the supported option >(e.g. "ignore-all-spaces"), the color-moved feature still did not >trigger. I think the presence of --color-moved-ws by itself is a >hint that the user wants

Re: [PATCH v4 0/6] Fix the racy split index problem

2018-10-11 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Thu, Oct 11 2018, SZEDER Gábor wrote: > >> Fourth and hopefully final round of fixing occasional test failures when >> run with 'GIT_TEST_SPLIT_INDEX=yes'. The only code change is the >> extraction of a helper function to compare two cache entries' content,

Re: [PATCH 04/19] object-store: prepare read_object_file to deal with arbitrary repositories

2018-10-11 Thread Jonathan Tan
> Introduce repo_read_object_file which takes the repository argument, and > hide the original read_object_file as a macro behind > NO_THE_REPOSITORY_COMPATIBILITY_MACROS, which we planned for in > e675765235 (diff.c: remove implicit dependency on the_index, 2018-09-21) That commit didn't seem to

Re: [PATCH 16/19] pretty: prepare format_commit_message to handle arbitrary repositories

2018-10-11 Thread Jonathan Tan
Patches 6-16 are all quite straightforward, and are reviewed-by: me.

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Rafael Ascensão
On Thu, Oct 11, 2018 at 04:53:23PM -0400, Jeff King wrote: > Right, I like that part. It's just that putting "HEAD" there already has > a meaning: it would find refs/heads/HEAD. > > Now I'll grant that's a bad name for a branch (and the source of other > confusions, and I think perhaps even

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Daniels Umanovskis
On 10/12/18 12:56 AM, SZEDER Gábor wrote: > Ah, OK, just noticed v3 which has already fixed this. > Yeah - squashed the wrong commits locally for v2. Thanks for pointing this out anyway!

[PATCH] diff.c: die on unknown color-moved ws mode

2018-10-11 Thread Stefan Beller
Noticed-by: Junio C Hamano Signed-off-by: Stefan Beller --- There is no "ignore-any" supported by the feature---I think that the parser for the option should have noticed and barfed, but it did not. It merely emitted a message to the standard output and let it scroll away with

[RFC PATCH 2/3] Documentation/git-rev-list: s///

2018-10-11 Thread Matthew DeVore
git-rev-list has a mode where it works on the granularity of trees and blobs, rather than commits only. When discussing this mode in documenation, it can get awkward to refer to the list of arguments that may include blobs and trees as . It is especially awkward in a follow-up patch, so prepare

[RFC PATCH 1/3] list-objects: support for skipping tree traversal

2018-10-11 Thread Matthew DeVore
The tree:0 filter does not need to traverse the trees that it has filtered out, so optimize list-objects and list-objects-filter to skip traversing the trees entirely. Before this patch, we iterated over all children of the tree, and did nothing for all of them, which was wasteful. Signed-off-by:

[RFC PATCH 0/3] support for filtering trees and blobs based on depth

2018-10-11 Thread Matthew DeVore
This adds support for depth >0 in the tree: filter. Before this patch, only =0 is supported, which means all trees and blobs are filtered. The purpose of this is to allow fetching of entire directories in a partial clone use case. If I do a partial clone of a repo with no objects and then want to

[RFC PATCH 3/3] list-objects-filter: teach tree:# how to handle >0

2018-10-11 Thread Matthew DeVore
Implement positive values for in the tree: filter. The exact semantics are described in Documentation/rev-list-options.txt. The long-term goal at the end of this is to allow a partial clone to eagerly fetch an entire directory of files by fetching a tree and specifying =1. This, for instance,

Re: [PATCH 18/19] submodule: don't add submodule as odb for push

2018-10-11 Thread Stefan Beller
> Do you know if pushing of submodules is exercised by any test? t5531-deep-submodule-push.sh (all of them) t5545-push-options.sh (ok 4 - push options and submodules)

Re: [RFC PATCH 00/19] Bring more repository handles into our code base

2018-10-11 Thread Junio C Hamano
Stefan Beller writes: > Additionally each patch adds a semantic patch, that would port from the old to > the new function. These semantic patches are all applied in the very last > patch, > but we could omit applying the last patch if it causes too many merge > conflicts > and trickl in the

[PATCH v2 1/1] protocol: advertise multiple supported versions

2018-10-11 Thread steadmon
From: Josh Steadmon Currently the client advertises that it supports the wire protocol version set in the protocol.version config. However, not all services support the same set of protocol versions. When connecting to git-receive-pack, the client automatically downgrades to v0 if

[PATCH v2 0/1] Advertise multiple supported proto versions

2018-10-11 Thread steadmon
From: Josh Steadmon This is an alternate approach to the previous series. We add a registry of supported wire protocol versions that individual commands can use to declare supported versions before contacting a server. The client will then advertise all supported versions, while the server will

Re: [PATCH v6] log: fix coloring of certain octupus merge shapes

2018-10-11 Thread Junio C Hamano
I'll do the s/octu/octo/; again on the title while queuing. Let's merge this to 'next'. Thanks.

Re: [PATCH 04/19] object-store: prepare read_object_file to deal with arbitrary repositories

2018-10-11 Thread Stefan Beller
On Thu, Oct 11, 2018 at 3:01 PM Jonathan Tan wrote: > > > Introduce repo_read_object_file which takes the repository argument, and > > hide the original read_object_file as a macro behind > > NO_THE_REPOSITORY_COMPATIBILITY_MACROS, which we planned for in > > e675765235 (diff.c: remove implicit

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread SZEDER Gábor
On Wed, Oct 10, 2018 at 10:54:32PM +0200, Daniels Umanovskis wrote: [...] > diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh > index ee6787614..e9bc3b05f 100755 > --- a/t/t3203-branch-output.sh > +++ b/t/t3203-branch-output.sh > @@ -100,6 +100,47 @@ test_expect_success 'git

Re: [PATCH] diff.c: die on unknown color-moved ws mode

2018-10-11 Thread Junio C Hamano
Stefan Beller writes: > Noticed-by: Junio C Hamano > Signed-off-by: Stefan Beller > --- > > >There is no "ignore-any" supported by the feature---I think that >the parser for the option should have noticed and barfed, but it >did not. It merely emitted a message to the standard

Re: [PATCH 03/19] object-store: allow read_object_file_extended to read from arbitrary repositories

2018-10-11 Thread Jonathan Tan
> @@ -1413,10 +1414,10 @@ void *read_object_file_extended(const struct > object_id *oid, > const char *path; > struct stat st; > const struct object_id *repl = lookup_replace ? > - lookup_replace_object(the_repository, oid) : oid; > +

MARKETING & SALES PROMOTION EXPO – Exhibit at Japan's growing advertising market to expand your business in Japan/Asia-Pacific!

2018-10-11 Thread MARKETING & SALES PROMOTION EXPO Show Management
Dear International Sales & Marketing Director Zhejiang Wuchuan Industrial Co., Ltd, This is Reed Exhibitions Japan Ltd., organiser of MARKETING & SALES PROMOTION EXPO [June]. MARKETING & SALES PROMOTION EXPO [June] is Japan's largest trade show for marketing & sales promotion products and

Re: [PATCH v3 7/7] revision.c: refactor basic topo-order logic

2018-10-11 Thread Stefan Beller
On Fri, Sep 21, 2018 at 10:39 AM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee [...] > For the test above, I specifically selected a path that is changed > frequently, including by merge commits. A less-frequently-changed > path (such as 'README') has similar end-to-end time

Re: [PATCH 18/19] submodule: don't add submodule as odb for push

2018-10-11 Thread Jonathan Tan
> The submodule was added as an alternative in eb21c732d6 (push: teach > --recurse-submodules the on-demand option, 2012-03-29), but was > not explained, why. > > In similar code, submodule_has_commits, the submodule is added as an > alternative to perform a quick check if we need to dive into

Re: [PATCH] diff.c: die on unknown color-moved ws mode

2018-10-11 Thread Stefan Beller
On Thu, Oct 11, 2018 at 3:59 PM Stefan Beller wrote: > - error(_("ignoring unknown color-moved-ws mode '%s'"), > sb.buf); > + die(_("ignoring unknown color-moved-ws mode '%s'"), > sb.buf); s/ignoring// as it was sent in a haste.

Re: [PATCH v3] branch: introduce --show-current display option

2018-10-11 Thread Junio C Hamano
Daniels Umanovskis writes: > +static void print_current_branch_name(void) Thanks for fixing this (I fixed this in the previous round in my tree but forgot to tell you about it). > diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh > index ee6787614..8d2020aea 100755 > ---

Re: [PATCH v3] branch: introduce --show-current display option

2018-10-11 Thread Daniels Umanovskis
On 10/12/18 1:15 AM, Junio C Hamano wrote: > It is a bit curious why you remove the branch but not the tag after > this test. [..] > > So two equally valid choices are to remove "branch -d" and then > either: > > (1) leave both branch and tag after this test in the test > repository > >

Re: [PATCH v6] log: fix coloring of certain octupus merge shapes

2018-10-11 Thread Noam Postavsky
On Tue, 9 Oct 2018 at 21:43, Junio C Hamano wrote: > I had a bit hard time parsing the above, especially with "then", > which probably would make it easier to read if it is not there. Okay, I guess better to separate the explanation from the diagrams, rather than weaving them together: For

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-11 Thread Junio C Hamano
Stefan Beller writes: > I think we should add these tweaks, such that > color-moved-ws implies color-moved (both config and CLI options) > and --color-moved implies --color (command line only) I am not sure what you mean by "both config and". I'd find it entirely sensible for a user to say "I

Re: [PATCH v4 0/1] contrib: Add script to show uncovered "new" lines

2018-10-11 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > CHANGES IN V4: I reduced the blame output using -s which decreases the > width. I include a summary of the commit authors at the end to help people > see the lines they wrote. This version is also copied into a build > definition in the public Git

Re: [PATCH v3 3/7] test-reach: add rev-list tests

2018-10-11 Thread Junio C Hamano
Jeff King writes: > On Fri, Sep 21, 2018 at 10:39:30AM -0700, Derrick Stolee via GitGitGadget > wrote: > >> From: Derrick Stolee >> >> The rev-list command is critical to Git's functionality. Ensure it >> works in the three commit-graph environments constructed in >> t6600-test-reach.sh. Here

[PATCHv1 3/3] git-p4: fully support unshelving changelists

2018-10-11 Thread Luke Diamand
The previous git-p4 unshelve support would check for changes in Perforce to the files being unshelved since the original shelve, and would complain if any were found. This was to ensure that the user wouldn't end up with both the shelved change delta, and some deltas from other changes in their

[PATCHv1 0/3] git-p4: improved unshelving

2018-10-11 Thread Luke Diamand
This patch series teaches the git-p4 unshelve command to handle intervening changes to the Perforce files. At the moment if you try to unshelve a file, and that file has been modified since the shelving, git-p4 refuses. That is so that it doesn't end up generating a commit containing deltas from

[PATCHv1 1/3] git-p4: do not fail in verbose mode for missing 'fileSize' key

2018-10-11 Thread Luke Diamand
If deleting or moving a file, sometimes P4 doesn't report the file size. The code handles this just fine but some logging crashes. Stop this happening. There was some earlier discussion on the list about this: https://public-inbox.org/git/xmqq1sqpp1vv@gitster.mtv.corp.google.com/

[PATCHv1 2/3] git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved

2018-10-11 Thread Luke Diamand
The branch detection code looks for branches under refs/remotes/p4/... and can end up getting confused if there are unshelved changes in there as well. This happens in the function p4BranchesInGit(). Instead, put the unshelved changes into refs/remotes/p4-unshelved/. Signed-off-by: Luke Diamand

Re: [PATCH 2/3] send-email: only consider lines containing @ or <> for automatic Cc'ing

2018-10-11 Thread Junio C Hamano
Rasmus Villemoes writes: > I considered that (and also had a version where I simply insisted on a @ > being present), but that means the user no longer would get prompted > about the cases where the address was just slightly obfuscated, e.g. the > > Cc: John Doe > > cases, which would be a

Re: [PATCH 3/3] send-email: also pick up cc addresses from -by trailers

2018-10-11 Thread Junio C Hamano
Rasmus Villemoes writes: > @@ -1681,7 +1681,7 @@ sub process_file { > # Now parse the message body > while(<$fh>) { > $message .= $_; > - if (/^(Signed-off-by|Cc): (.*)/i) { > + if (/^([a-z-]*-by|Cc): (.*)/i) { So this picks up anything-by not

Re: [PATCH 3/3] mingw: bump the minimum Windows version to Vista

2018-10-11 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> It also means that we no longer need the inet_pton() and inet_ntop() >> emulation, which is nice. > > Earlier in this series you add a: > > #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600 > ... > #endif > > Shouldn't that now be something like: > > #if

Re: [PATCH v2 1/1] branch: introduce --show-current display option

2018-10-11 Thread Junio C Hamano
Daniels Umanovskis writes: > +static void print_current_branch_name() > +{ > + const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL); > + const char *shortname; > + if (refname == NULL || !strcmp(refname, "HEAD")) > + return; Is it a normal situation to have

Re: [PATCH 2/3] send-email: only consider lines containing @ or <> for automatic Cc'ing

2018-10-11 Thread Rasmus Villemoes
On 2018-10-11 08:06, Junio C Hamano wrote: > Rasmus Villemoes writes: > >> I considered that (and also had a version where I simply insisted on a @ >> being present), but that means the user no longer would get prompted >> about the cases where the address was just slightly obfuscated, e.g. the

Re: [PATCH 3/3] send-email: also pick up cc addresses from -by trailers

2018-10-11 Thread Rasmus Villemoes
On 2018-10-11 08:18, Junio C Hamano wrote: > Rasmus Villemoes writes: > we now ... > >> +next if $suppress_cc{'sob'} and $what =~ >> /^Signed-off-by$/i; > > ... must make sure what we have is _exactly_ "signed-off-by" when > 'sob' is suppressed. Makes sense. >

Re: [PATCH 0/2] Per-commit filter proof of concept

2018-10-11 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 11 2018, Jonathan Tan wrote: > Using per-commit filters and restricting the bloom filter to a single > parent increases the relative power of the filter in omitting tree > inspections compared to the original (107/53096 vs 1183/66459), but the > lack of coverage w.r.t. the non-first

Re: [PATCH] range-diff: allow to diff files regardless submodule

2018-10-11 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Lucas De Marchi wrote: > Do like it's done in grep so mode doesn't end up as > 016, which means range-diff doesn't work if one has > "submodule.diff = log" in the configuration. Without this > while using range-diff I only get a > > Submodule a 000...000

Re: [PATCH] gc: remove redundant check for gc_auto_threshold

2018-10-11 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Junio C Hamano wrote: > Brandon Casey writes: > >> ... Again, I don't feel strongly about it, but I'm not >> sure this change actually improves the code. > > Yeah, in the context of the current caller, this is a safe change > that does not break anybody and reduces the

Re: [PATCH] range-diff: allow to diff files regardless submodule

2018-10-11 Thread Lucas De Marchi
On Wed, Oct 10, 2018 at 5:02 PM brian m. carlson wrote: > > On Wed, Oct 10, 2018 at 08:09:16AM -0700, Lucas De Marchi wrote: > > Do like it's done in grep so mode doesn't end up as > > 016, which means range-diff doesn't work if one has > > "submodule.diff = log" in the configuration. Without

Re: [PATCH] range-diff: allow to diff files regardless submodule

2018-10-11 Thread Lucas De Marchi
On Thu, Oct 11, 2018 at 12:42 AM Ævar Arnfjörð Bjarmason wrote: > > > On Wed, Oct 10 2018, Lucas De Marchi wrote: > > > Do like it's done in grep so mode doesn't end up as > > 016, which means range-diff doesn't work if one has > > "submodule.diff = log" in the configuration. Without this > >

Re: [PATCH v2 1/2] rebase -i: clarify what happens on a failed `exec`

2018-10-11 Thread Junio C Hamano
Eric Sunshine writes: > On Wed, Oct 10, 2018 at 4:54 AM Johannes Schindelin via GitGitGadget > wrote: >> We had not documented previously what happens when an `exec` command in >> an interactive rebase fails. Now we do. >> >> Signed-off-by: Johannes Schindelin >> --- >> diff --git

  1   2   >