Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-08-13 Thread René Scharfe
Am 11.08.2018 um 19:23 schrieb Jeff King: On Sat, Aug 11, 2018 at 01:02:48PM -0400, Jeff King wrote: - we could probably improve the speed of oidset. Two things I notice about its implementation: - it has to malloc for each entry, which I suspect is the main bottleneck.

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-08-13 Thread René Scharfe
Am 11.08.2018 um 22:59 schrieb René Scharfe: If the current oidset implementation is so bad, why not replace it with one based on oid_array? ;-) Intuitively I'd try a hashmap with no payload and open addressing via sha1hash(), which should reduce memory allocations quite a bit -- no need to

Re: [PATCH v4 5/5] unpack-trees: reuse (still valid) cache-tree from src_index

2018-08-13 Thread Ben Peart
On 8/13/2018 12:25 PM, Duy Nguyen wrote: On Mon, Aug 13, 2018 at 6:05 PM Ben Peart wrote: I was part way through writing a patch that would copy the valid parts of the cache-tree from the source index to the dest index Yeah sorry about that. I make bad judgements all the time,

Re: Contributor Summit planning

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 12:58:54PM -0400, Derrick Stolee wrote: > I would be up for two meetings a year. I would expect that the variety of > locations would allow a larger set of contributors to make at least one > meeting a year. This may come at a cost of a smaller group in each summit. Yeah,

Re: [PATCH v6 11/21] range-diff: add tests

2018-08-13 Thread Thomas Gummerer
On 08/13, Thomas Rast via GitGitGadget wrote: > From: Thomas Rast > > These are essentially lifted from https://github.com/trast/tbdiff, with > light touch-ups to account for the command now being named `git > range-diff`. > > Apart from renaming `tbdiff` to `range-diff`, only one test case

Re: [PATCH 0/7] speeding up cat-file by reordering object access

2018-08-13 Thread Jonathan Tan
> [1/7]: for_each_*_object: store flag definitions in a single location > [2/7]: for_each_*_object: take flag arguments as enum > [3/7]: for_each_*_object: give more comprehensive docstrings > [4/7]: for_each_packed_object: support iterating in pack-order > [5/7]: t1006: test cat-file

Re: [PATCH] t5318: avoid unnecessary command substitutions

2018-08-13 Thread Junio C Hamano
SZEDER Gábor writes: > - echo $(git -C repo log --pretty="%ct" -1) \ > - $(git -C repo rev-parse one) >expect && > + { > + git -C repo log --pretty=format:"%ct " -1 && > + git -C repo rev-parse one > + } >expect && Heh, "format:"%ct " to make the

Re: [PATCH] mergetool: don't suggest to continue after last file

2018-08-13 Thread Junio C Hamano
Nicholas Guriev writes: > This eliminates an unnecessary prompt to continue after failed merger. > The patch uses positional parameters to count files in the list. If only > one iteration is remained, the prompt_after_failed_merge function is not s/is remained/remains/, I think. Other than

[PATCH v3 0/7] Prep for "git fetch" should not clobber existing tags without --force

2018-08-13 Thread Ævar Arnfjörð Bjarmason
I have not had time to re-submit a v2 of my patch series to make "+" meaningful in refspecs when it comes to tags, see v2 here: https://public-inbox.org/git/20180731130718.25222-1-ava...@gmail.com/ Given where we're at with the 2.19 release I'd like to propose this shortened version for inclusion

[PATCH v3 7/7] pull doc: fix a long-standing grammar error

2018-08-13 Thread Ævar Arnfjörð Bjarmason
It should be "is not an empty string" not "is not empty string". This fixes wording originally introduced in ab9b31386b ("Documentation: multi-head fetch.", 2005-08-24). Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/pull-fetch-param.txt | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH v3 4/7] push tests: add more testing for forced tag pushing

2018-08-13 Thread Ævar Arnfjörð Bjarmason
Improve the tests added in dbfeddb12e ("push: require force for refs under refs/tags/", 2012-11-29) to assert that the same behavior applies various other combinations of command-line option and refspecs. Supplying either "+" in refspec or "--force" is sufficient to clobber the reference. With

[PATCH v3 2/7] push tests: remove redundant 'git push' invocation

2018-08-13 Thread Ævar Arnfjörð Bjarmason
Remove an invocation of 'git push' that's exactly the same as the one on the preceding line. This was seemingly added by mistake in dbfeddb12e ("push: require force for refs under refs/tags/", 2012-11-29) and doesn't affect the result of the test, the second "push" was a no-op as there was nothing

[PATCH v3 3/7] push tests: fix logic error in "push" test assertion

2018-08-13 Thread Ævar Arnfjörð Bjarmason
Fix a logic error that's been here since this test was added in dbfeddb12e ("push: require force for refs under refs/tags/", 2012-11-29). The intent of this test is to force-create a new tag pointing to HEAD~, and then assert that pushing it doesn't work without --force. Instead, the code was

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 12:25 PM Jeff King wrote: > I can buy the argument that it's nice to have some form of profiling > that works everywhere, even if it's lowest-common-denominator. I just > wonder if we could be investing effort into tooling around existing > solutions that will end up more

Re: [PATCH v2 2/6] chainlint: match 'quoted' here-doc tags

2018-08-13 Thread Eric Sunshine
On Mon, Aug 13, 2018 at 3:27 PM Junio C Hamano wrote: > Eric Sunshine writes: > > > A here-doc tag can be quoted ('EOF') or escaped (\EOF) to suppress > > interpolation within the body. Although, chainlint recognizes escaped > > tags, it does not know about quoted tags. For completeness, teach

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-08-13 Thread René Scharfe
Am 13.08.2018 um 20:43 schrieb Junio C Hamano: René Scharfe writes: @@ -182,19 +181,10 @@ static int fsck_msg_type(enum fsck_msg_id msg_id, static void init_skiplist(struct fsck_options *options, const char *path) { - static struct oid_array skiplist = OID_ARRAY_INIT; - int

Re: [PATCH 02/24] cache-tree: wrap the_index based wrappers with #ifdef

2018-08-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > This puts update_main_cache_tree() and write_cache_as_tree() in the > same group of "index compat" functions that assume the_index > implicitly, which should only be used within builtin/ or t/helper. > > sequencer.c is also updated to not use these functions. As

Re: [PATCH 05/24] dir.c: remove an implicit dependency on the_index in pathspec code

2018-08-13 Thread Brandon Williams
On 08/13, Nguyễn Thái Ngọc Duy wrote: > diff --git a/dir.c b/dir.c > index 29fbbd48c8..e25aed013b 100644 > --- a/dir.c > +++ b/dir.c > @@ -276,12 +276,13 @@ static int do_read_blob(const struct object_id *oid, > struct oid_stat *oid_stat, > #define DO_MATCH_DIRECTORY (1<<1) > #define

Re: [PATCH v4 0/5] Speed up unpack_trees()

2018-08-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > v4 has a bunch of changes > > - 1/5 is a new one to show indented tracing. This way it's less > misleading to read nested time measurements > - 3/5 now has the switch/restore cache_bottom logic. Junio suggested a > check instead in his final note, but I think

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-13 Thread Junio C Hamano
Johannes Sixt writes: > The Windows CRT implements O_APPEND "manually": on write() calls, the > file pointer is set to EOF before the data is written. Clearly, this is > not atomic. And in fact, this is the root cause of failures observed in > t5552-skipping-fetch-negotiator.sh and

Re: Contributor Summit planning

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 1:36 PM Junio C Hamano wrote: > > Ævar Arnfjörð Bjarmason writes: > > >Or would those companies be OK with trusting that some 20-ish of us > >can hold our tongues for one day and not ruin the surprise? > > > >There's also overlap with the remote A/V concerns

Unable to build Info pages using "make info"

2018-08-13 Thread Kaushal Modi
Hello, I have updated to the latest master and trying to build git plus its Info manuals. I am on RHEL 6.8. It does not have docbook2x-texi, but I was able to install docbook2texi from https://sourceforge.net/p/docbook2x. The whole git build goes fine except when it reaches the "make info"

Re: [PATCH 04/24] convert.c: remove an implicit dependency on the_index

2018-08-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Make the convert API take an index_state instead of assuming the_index > in convert.c. All external call sites are converted blindly to keep > the patch simple and retain current behavior. Individual call sites > may receive further updates to use the right index

[PATCH] Documentation: partial clone-related arguments

2018-08-13 Thread Jonathan Tan
Commit 88e2f9ed8e ("introduce fetch-object: fetch one promisor object", 2017-12-05) introduced new command-line arguments without documenting them. Add documentation for these arguments. Signed-off-by: Jonathan Tan --- This is a follow-up to [1] in which Junio noticed some arguments lacking

[PATCHv3 6/6] Add missing includes and forward declares

2018-08-13 Thread Elijah Newren
Signed-off-by: Elijah Newren --- bisect.h | 2 ++ pack-objects.h | 1 + 2 files changed, 3 insertions(+) diff --git a/bisect.h b/bisect.h index a5d9248a47..34df209351 100644 --- a/bisect.h +++ b/bisect.h @@ -1,6 +1,8 @@ #ifndef BISECT_H #define BISECT_H +struct commit_list; + /* *

[PATCHv3 1/6] Add missing includes and forward declares

2018-08-13 Thread Elijah Newren
Signed-off-by: Elijah Newren --- alloc.h | 2 ++ apply.h | 3 +++ archive.h | 3 +++ attr.h| 1 + branch.h | 2 ++ bulk-checkin.h| 2 ++ column.h | 1 + commit-graph.h| 1 + config.h

[PATCHv3 2/6] alloc: make allocate_alloc_state and clear_alloc_state more consistent

2018-08-13 Thread Elijah Newren
Since both functions are using the same data type, they should either both refer to it as void *, or both use the real type (struct alloc_state *). Opt for the latter. Signed-off-by: Elijah Newren --- alloc.c | 2 +- alloc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCHv3 5/6] compat/precompose_utf8.h: use more common include guard style

2018-08-13 Thread Elijah Newren
Signed-off-by: Elijah Newren --- compat/precompose_utf8.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/precompose_utf8.h b/compat/precompose_utf8.h index a94e7c4342..6f843d3e1a 100644 --- a/compat/precompose_utf8.h +++ b/compat/precompose_utf8.h @@ -1,4 +1,6 @@

Re: de-alphabetizing the documentation

2018-08-13 Thread Junio C Hamano
frede...@ofb.net writes: > Hi Jonathan and Git developers, > > I poked around today and figured out how to reorder the command > listings in the manual page, they are taken from git/command-list.txt > so I just reorder the lines in that file (after disabling sorting in >

Re: [PATCH v2 5/5] list-objects-filter: implement filter tree:none

2018-08-13 Thread Jonathan Tan
> - case LOFS_BEGIN_TREE: > - assert(obj->type == OBJ_TREE); > - /* always include all tree objects */ > - return LOFR_MARK_SEEN | LOFR_DO_SHOW; > - > case LOFS_END_TREE: > assert(obj->type == OBJ_TREE); > return LOFR_ZERO;

Re: [PATCH v4 3/5] unpack-trees: optimize walking same trees with cache-tree

2018-08-13 Thread Ben Peart
On 8/12/2018 4:15 AM, Nguyễn Thái Ngọc Duy wrote: In order to merge one or many trees with the index, unpack-trees code walks multiple trees in parallel with the index and performs n-way merge. If we find out at start of a directory that all trees are the same (by comparing OID) and

Re: [RFC] implement branch.sort config option

2018-08-13 Thread Junio C Hamano
Samuel Maftoul writes: > I'm still missing tests and docs, but if agreed the feature is useful, > I will write them. I personally think branch.sort would have about the same value as the existing tag.sort, so if a patch is done well, it is likely that users would find it valuable, but let's

Re: [PATCHv3 0/5] Simple fixes to t7406

2018-08-13 Thread SZEDER Gábor
On Tue, Aug 7, 2018 at 6:49 PM Elijah Newren wrote: > Since folks like to notice other problems with t7406 while reading my > patches, here's a challenge: > > Find something *else* wrong with t7406 that neither I nor any of the > reviewers so far have caught that could be fixed. Well, I'd

Re: Contributor Summit planning

2018-08-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >Or would those companies be OK with trusting that some 20-ish of us >can hold our tongues for one day and not ruin the surprise? > >There's also overlap with the remote A/V concerns there. I.e. an >acceptable compromise for those companies might

Re: [PATCH v3 0/7] Prep for "git fetch" should not clobber existing tags without --force

2018-08-13 Thread Ævar Arnfjörð Bjarmason
On Mon, Aug 13 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> This is unchanged from what's been cooking in pu for months now, so >> hopefully it can be merged down faster than most, and then I can later >> submit the actual meat of this series once I fix the (mostly doc)

Re: Contributor Summit planning

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 01:41:51PM -0700, Stefan Beller wrote: > > Oh, using "git shortlog" might be also simpler ;-) > > I guess you'd need to memorize a different set of flags for that > as without -s it would be harder to parse than the oneliner above. I frequently using "git shortlog -ns"

Re: [PATCH v3 1/1] clone: report duplicate entries on case-insensitive filesystems

2018-08-13 Thread Duy Nguyen
On Mon, Aug 13, 2018 at 6:55 PM Junio C Hamano wrote: > > Duy Nguyen writes: > > > I was careless and checked the wrong variable (should have checked > > nr_duplicates not state.nr_duplicates; the second is a pointer). So we > > always get this warning (and with no following list of files) > >

Re: [PATCH 2/8] t3206: add color test for range-diff --dual-color

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 5:05 AM Johannes Schindelin wrote: > > Hi Stefan, > > On Fri, 10 Aug 2018, Stefan Beller wrote: > > > +test_expect_success 'dual-coloring' ' > > + sed -e "s|^:||" >expect <<-\EOF && > > + :1: a4b = 1: f686024 s/5/A/ > > + :2: f51d370 ! 2: > > 4ab067d

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-13 Thread Ben Peart
On 8/13/2018 3:36 PM, Stefan Beller wrote: On Mon, Aug 13, 2018 at 12:25 PM Jeff King wrote: I can buy the argument that it's nice to have some form of profiling that works everywhere, even if it's lowest-common-denominator. I just wonder if we could be investing effort into tooling around

Re: [PATCH v3 0/7] Prep for "git fetch" should not clobber existing tags without --force

2018-08-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > This is unchanged from what's been cooking in pu for months now, so > hopefully it can be merged down faster than most, and then I can later > submit the actual meat of this series once I fix the (mostly doc) > issues with it. They have been held in 'pu' only

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-13 Thread Ævar Arnfjörð Bjarmason
On Mon, Aug 13 2018, Johannes Sixt wrote: > Am 13.08.2018 um 22:20 schrieb Junio C Hamano: >> Johannes Sixt writes: >> >>> The Windows CRT implements O_APPEND "manually": on write() calls, the >>> file pointer is set to EOF before the data is written. Clearly, this is >>> not atomic. And in

Re: [PATCH v4] clone: report duplicate entries on case-insensitive filesystems

2018-08-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Paths that only differ in case work fine in a case-sensitive > filesystems, but if those repos are cloned in a case-insensitive one, > you'll get problems. The first thing to notice is "git status" will > never be clean with no indication what exactly is "dirty".

Re: [PATCH 00/24] Kill the_index part3

2018-08-13 Thread Brandon Williams
On 08/13, Nguyễn Thái Ngọc Duy wrote: > This is the third part of killing the_index (at least outside > builtin/). Part 1 [1] is dropped. Part 2 is nd/no-extern on 'pu'. This > part is built on top of nd/no-extern. > > This series would actually break 'pu' because builtin/stash.c uses > three

Re: [PATCH 1/4] diff.c: emit_line_0 to take string instead of first sign

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 4:42 AM Johannes Schindelin wrote: > > +/* > > + * Emits > > + * LF > > + * if they are present. 'first' is a NULL terminated string, > > + * 'second' is a buffer of length 'len'. > > + */ > > That does not make it clear what the role of `first` or `second` is.

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-13 Thread Junio C Hamano
Thomas Adam writes: > On Sun, 12 Aug 2018 at 09:19, Nguyễn Thái Ngọc Duy wrote: > > Hi, > >> + trace_performance_leave("cache_tree_update"); > > I would suggest trace_performance_leave() calls use __func__ instead. > That way, there's no ambiguity if the function name ever changes.

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 05:33:59AM +0200, Christian Couder wrote: > >> + memcpy(_core, oid->hash, sizeof(uint64_t)); > >> + rl->hash += sha_core; > > > > Hmm, so the first 64-bits of the oid of each ref that is part of > > this island is added together as a 'hash' for the island. And this

Re: [PATCH 7/8] diff.c: compute reverse locally in emit_line_0

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 5:26 AM Johannes Schindelin wrote: > > Hi, > > > On Fri, 10 Aug 2018, Stefan Beller wrote: > > > Signed-off-by: Stefan Beller > > Signed-off-by: Junio C Hamano > > Well, my rationale for having the explicit `reverse` parameter is: this > code is complex enough,

[PATCH] mingw: enable atomic O_APPEND

2018-08-13 Thread Johannes Sixt
The Windows CRT implements O_APPEND "manually": on write() calls, the file pointer is set to EOF before the data is written. Clearly, this is not atomic. And in fact, this is the root cause of failures observed in t5552-skipping-fetch-negotiator.sh and t5503-tagfollow.sh, where different processes

Re: Contributor Summit planning

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 08:49:33PM +0200, Ævar Arnfjörð Bjarmason wrote: > * I think we should tread carefully when it comes to say some form of >remote A/V participation open to the Internet. > >It was fine to have Dscho on a chair, but it would be quite different >if this were say

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-13 Thread Duy Nguyen
On Mon, Aug 13, 2018 at 9:25 PM Jeff King wrote: > Am I the only one who feels a little funny about us sprinkling these > performance probes through the code base? > > On Linux, "perf" already does a great job of this without having to > modify the source, and there are tools like: > >

Re: [PATCH v6 00/21] Add range-diff, a tbdiff lookalike

2018-08-13 Thread Thomas Gummerer
On 08/13, Johannes Schindelin wrote: > Hi, > > On Mon, 13 Aug 2018, Johannes Schindelin via GitGitGadget wrote: > > > The incredibly useful git-tbdiff [https://github.com/trast/tbdiff] tool to > > compare patch series (say, to see what changed between two iterations sent > > to the Git mailing

Re: [GSoC][PATCH v6 00/20] rebase -i: rewrite in C

2018-08-13 Thread Alban Gruin
Hi Duy, Le 13/08/2018 à 18:06, Duy Nguyen a écrit : > On Fri, Aug 10, 2018 at 6:54 PM Alban Gruin wrote: > > This patch series rewrite the interactive rebase from shell to C. > > I was running some tests on 'pu' and ran git-rebase--interactive > without arguments because a test failed and I was

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-08-13 Thread Junio C Hamano
René Scharfe writes: > the mailing list [1], nor on the web interface [2]. The latter shows > extra spaces on the context lines of the first hunk, though, which I > can't see anywhere else. All the lines look fine in the citation of > Ramsay's reply [3]. So I don't know where these extra

Re: [PATCH 03/24] attr: remove an implicit dependency on the_index

2018-08-13 Thread Brandon Williams
On 08/13, Nguyễn Thái Ngọc Duy wrote: > Make the attr API take an index_state instead of assuming the_index in > attr code. All call sites are converted blindly to keep the patch > simple and retain current behavior. Individual call sites may receive > further updates to use the right index

[PATCHv3 3/6] Move definition of enum branch_track from cache.h to branch.h

2018-08-13 Thread Elijah Newren
'branch_track' feels more closely related to branching, and it is needed later in branch.h; rather than #include'ing cache.h in branch.h for this small enum, just move the enum and the external declaration for git_branch_track to branch.h. Signed-off-by: Elijah Newren --- branch.h | 11

[PATCHv3 4/6] urlmatch.h: fix include guard

2018-08-13 Thread Elijah Newren
Signed-off-by: Elijah Newren --- urlmatch.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/urlmatch.h b/urlmatch.h index 37ee5da85e..e482148248 100644 --- a/urlmatch.h +++ b/urlmatch.h @@ -1,4 +1,6 @@ #ifndef URL_MATCH_H +#define URL_MATCH_H + #include "string-list.h" struct url_info

[PATCHv3 0/6] Add missing includes and forward declares

2018-08-13 Thread Elijah Newren
This series fixes compilation errors when using a simple test.c file that includes git-compat-util.h and then exactly one other header (and repeating this for different headers of git). Changes since v2 (full range-diff below): - Ensure the first #include in C files is either git-compat-util.h,

Re: Contributor Summit planning

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 9:31 AM Jeff King wrote: > > For the past several years, we've held a Git Contributor Summit as part > of the Git Merge conference. I'd like to get opinions from the community > to help plan future installments. Any feedback or opinion is welcome, > but some obvious things

Re: [RFC] implement branch.sort config option

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 11:56:58AM +0200, Samuel Maftoul wrote: > Currently, you can: > > git tag --sort=$sorting_key > > You can also do this on branches: > > git branch --sort=$sorting_key > > For tags, you can also configure it with a config key: > > git config tag.sort $sorting_key > >

Re: [PATCH v5 05/21] range-diff: also show the diff between patches

2018-08-13 Thread Thomas Gummerer
On 08/13, Johannes Schindelin wrote: > Hi Thomas, > > On Sun, 12 Aug 2018, Thomas Gummerer wrote: > > > On 08/10, Johannes Schindelin via GitGitGadget wrote: > > > From: Johannes Schindelin > > > > [...] > > > > I don't think this handles "--" quite as would be expected. Trying to > > use

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 01:17:18PM +0100, Ramsay Jones wrote: > >>> +struct island_bitmap { > >>> + uint32_t refcount; > >>> + uint32_t bits[]; > >> > >> Use FLEX_ARRAY here? We are slowly moving toward requiring > >> certain C99 features, but I can't remember a flex array > >>

Re: [PATCH 3/4] range-diff: make use of different output indicators

2018-08-13 Thread Stefan Beller
> > strbuf_addbuf(, ); > > + } > > My preliminary reading (I sadly lack the time to pull your branch and play > with it) suggests that this works, although I have to admit that X/Y/Z > would confuse me in 6 months from now, as they do not really read like > diff

Re: [PATCH 4/4] range-diff: indent special lines as context

2018-08-13 Thread Stefan Beller
> > The later lines that indicate a change to the Makefile will be treated as > > context both in the outer and inner diff, such that those lines stay > > regular color. > > While I am a fan of having those lines colored correctly, I have to admit > that I am not exactly enthusiastic about that

Re: [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 5:42 AM Johannes Schindelin wrote: > > Hi Stefan, > > On Fri, 10 Aug 2018, Stefan Beller wrote: > > > emit_line_0 has no nested conditions, but puts out all its arguments > > (if set) in order. > > Well, currently `emit_line_0()` *has* nested conditions: `first == '\n'` >

Re: [PATCH v2 2/6] chainlint: match 'quoted' here-doc tags

2018-08-13 Thread Junio C Hamano
Eric Sunshine writes: > A here-doc tag can be quoted ('EOF') or escaped (\EOF) to suppress > interpolation within the body. Although, chainlint recognizes escaped > tags, it does not know about quoted tags. For completeness, teach it to > recognize quoted tags, as well. Is this step merely

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-13 Thread Johannes Sixt
Am 13.08.2018 um 22:20 schrieb Junio C Hamano: Johannes Sixt writes: The Windows CRT implements O_APPEND "manually": on write() calls, the file pointer is set to EOF before the data is written. Clearly, this is not atomic. And in fact, this is the root cause of failures observed in

Re: Contributor Summit planning

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 2:06 PM Jeff King wrote: > > On Mon, Aug 13, 2018 at 01:41:51PM -0700, Stefan Beller wrote: > > > > Oh, using "git shortlog" might be also simpler ;-) > > > > I guess you'd need to memorize a different set of flags for that > > as without -s it would be harder to parse

Re: [PATCH 16/24] attr: remove index from git_attr_set_direction()

2018-08-13 Thread Brandon Williams
On 08/13, Nguyễn Thái Ngọc Duy wrote: > Since attr checking API now take the index, there's no need to set an > index in advance with this call. Most call sites are straightforward > because they either pass the_index or NULL (which defaults back to > the_index previously). There's only one

Re: [PATCH v6 16/21] range-diff --dual-color: skip white-space warnings

2018-08-13 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > When displaying a diff of diffs, it is possible that there is an outer > `+` before a context line. That happens when the context changed between > old and new commit. When that context line starts with a tab (after

[PATCH v3 4/5] revision: mark non-user-given objects instead

2018-08-13 Thread Matthew DeVore
Currently, list-objects.c incorrectly treats all root trees of commits as USER_GIVEN. Also, it would be easier to mark objects that are non-user-given instead of user-given, since the places in the code where we access an object through a reference are more obvious than the places where we access

[PATCH v3 3/5] rev-list: handle missing tree objects properly

2018-08-13 Thread Matthew DeVore
Previously, we assumed only blob objects could be missing. This patch makes rev-list handle missing trees like missing blobs. A missing tree will cause an error if --missing indicates an error should be caused, and the hash is printed even if the tree is missing. In list-objects.c we no longer

[PATCH v3 5/5] list-objects-filter: implement filter tree:0

2018-08-13 Thread Matthew DeVore
Teach list-objects the "tree:0" filter which allows for filtering out all tree and blob objects (unless other objects are explicitly specified by the user). The purpose of this patch is to allow smaller partial clones. The name of this filter - tree:0 - does not explicitly specify that it also

[PATCH v3 1/5] list-objects: store common func args in struct

2018-08-13 Thread Matthew DeVore
This will make utility functions easier to create, as done by the next patch. Signed-off-by: Matthew DeVore --- list-objects.c | 158 +++-- 1 file changed, 74 insertions(+), 84 deletions(-) diff --git a/list-objects.c b/list-objects.c index

[PATCH v3 2/5] list-objects: refactor to process_tree_contents

2018-08-13 Thread Matthew DeVore
This will be used in a follow-up patch to reduce indentation needed when invoking the logic conditionally. i.e. rather than: if (foo) { while (...) { /* this is very indented */ } } we will have: if (foo) process_tree_contents(...); Signed-off-by:

[PATCH v3 0/5] filter: support for excluding all trees and blobs

2018-08-13 Thread Matthew DeVore
Applied the following changes suggested by g...@jeffhostetler.com: - Change the filter name from tree:none to tree:0 to make room for future improvements which allow filtering based on depth. - Made a separate filter logic function and filter data struct for tree:0 rather than share it

Re: [PATCH 05/24] dir.c: remove an implicit dependency on the_index in pathspec code

2018-08-13 Thread Duy Nguyen
On Mon, Aug 13, 2018 at 7:17 PM Brandon Williams wrote: > I'm just sorry I made it this messy :/ Take it with pride! I think all core devs can say "oh yes I've made big contributions. See there? I made that mess!" :D -- Duy

Re: [PATCH 00/24] Kill the_index part3

2018-08-13 Thread Junio C Hamano
Brandon Williams writes: > On 08/13, Nguyễn Thái Ngọc Duy wrote: >> This is the third part of killing the_index (at least outside >> builtin/). Part 1 [1] is dropped. Part 2 is nd/no-extern on 'pu'. This >> part is built on top of nd/no-extern. >> >> This series would actually break 'pu'

Re: [PATCH v2 3/5] rev-list: handle missing tree objects properly

2018-08-13 Thread Jonathan Tan
> In list-objects.c we no longer print a message to stderr if a tree > object is missing (quiet_on_missing is always true). I couldn't find > any place where this would matter, or where the caller of > traverse_commit_list would need to be fixed to show the error. However, > in the future it would

Re: [PATCH v4 1/5] trace.h: support nested performance tracing

2018-08-13 Thread Ben Peart
On 8/12/2018 4:15 AM, Nguyễn Thái Ngọc Duy wrote: Performance measurements are listed right now as a flat list, which is fine when we measure big blocks. But when we start adding more and more measurements, some of them could be just part of a bigger measurement and a flat list gives a wrong

Re: Contributor Summit planning

2018-08-13 Thread Ævar Arnfjörð Bjarmason
On Mon, Aug 13 2018, Jeff King wrote: > For the past several years, we've held a Git Contributor Summit as part > of the Git Merge conference. I'd like to get opinions from the community > to help plan future installments. Any feedback or opinion is welcome, > but some obvious things to think

[PATCH v3 5/7] push tests: assert re-pushing annotated tags

2018-08-13 Thread Ævar Arnfjörð Bjarmason
Change the test that asserts that lightweight tags can only be clobbered by a force-push to check do the same tests for annotated tags. There used to be less exhaustive tests for this with the code added in 40eff17999 ("push: require force for annotated tags", 2012-11-29), but Junio removed them

[PATCH v3 1/7] fetch tests: change "Tag" test tag to "testTag"

2018-08-13 Thread Ævar Arnfjörð Bjarmason
Calling the test tag "Tag" will make for confusing reading later in this series when making use of the "git push tag " feature. Let's call the tag testTag instead. Changes code initially added in dbfeddb12e ("push: require force for refs under refs/tags/", 2012-11-29). Signed-off-by: Ævar

[PATCH v3 6/7] fetch tests: correct a comment "remove it" -> "remove them"

2018-08-13 Thread Ævar Arnfjörð Bjarmason
Correct a comment referring to the removal of just the branch to also refer to the tag. This should have been changed in my ca3065e7e7 ("fetch tests: add a tag to be deleted to the pruning tests", 2018-02-09) when the tag deletion was added, but I missed it at the time. Signed-off-by: Ævar

Re: [PATCH 0/9] Add missing includes and forward declares

2018-08-13 Thread Junio C Hamano
Jeff King writes: > The rule in Git has always been that your very first include must > always be "git-compat-util.h" or an equivalent header that includes it > first (like "cache.h"). This is mentioned in CodingGuidelines. Glad to see that you already have written the above so I don't have to

Re: [PATCH 2/4] diff.c: add --output-indicator-{new, old, context}

2018-08-13 Thread Stefan Beller
On Mon, Aug 13, 2018 at 4:47 AM Johannes Schindelin wrote: > > Hi Steafn, > > On Fri, 10 Aug 2018, Stefan Beller wrote: > > > This will prove useful in range-diff in a later patch as we will be able to > > differentiate between adding a new file (that line is starting with +++ > > and then the

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-08-13 Thread Junio C Hamano
René Scharfe writes: > @@ -182,19 +181,10 @@ static int fsck_msg_type(enum fsck_msg_id msg_id, > static void init_skiplist(struct fsck_options *options, const char > *path) > { > - static struct oid_array skiplist = OID_ARRAY_INIT; > - int sorted; > FILE *fp; > struct

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-13 Thread Ben Peart
On 8/12/2018 4:15 AM, Nguyễn Thái Ngọc Duy wrote: We're going to optimize unpack_trees() a bit in the following patches. Let's add some tracing to measure how long it takes before and after. This is the baseline ("git checkout -" on webkit.git, 275k files on worktree) performance:

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-13 Thread Jeff King
On Sun, Aug 12, 2018 at 10:15:48AM +0200, Nguyễn Thái Ngọc Duy wrote: > We're going to optimize unpack_trees() a bit in the following > patches. Let's add some tracing to measure how long it takes before > and after. This is the baseline ("git checkout -" on webkit.git, 275k > files on worktree)

Re: Contributor Summit planning

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 02:19:07PM -0700, Stefan Beller wrote: > However the mailing list participation numbers there doesn't really > help me: > > ~/git-ml$ git shortlog --since 2017 -sne > 3721 Junio C Hamano > 2166 Stefan Beller > 2071 Jeff King > > and I certainly do not provide

Re: [PATCH v2 3/5] rev-list: handle missing tree objects properly

2018-08-13 Thread Matthew DeVore
Resending this in plain-text mode so that git@vger.kernel.org won't bounce it. Sorry for those of you receiving this twice. On Mon, Aug 13, 2018 at 11:20 AM Jonathan Tan wrote: > > > In list-objects.c we no longer print a message to stderr if a tree > > object is missing (quiet_on_missing is

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 09:52:41PM +0200, Duy Nguyen wrote: > I don't think I have really fully mastered 'perf'. In this case for > example, I don't think the default event 'cycles' is the right one > because we are hit hard by I/O as well. I think at least I now have an > excuse to try that

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-13 Thread Jeff King
On Mon, Aug 13, 2018 at 11:22:10PM +0200, Ævar Arnfjörð Bjarmason wrote: > > O_APPEND is POSIX and means race-free append. If you mark some call > > sites with O_APPEND, then that must be the ones that need race-free > > append. Hence, you would have to go the other route: Mark those call > >

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-08-13 Thread René Scharfe
Am 13.08.2018 um 23:07 schrieb Junio C Hamano: > René Scharfe writes: > >> the mailing list [1], nor on the web interface [2]. The latter shows >> extra spaces on the context lines of the first hunk, though, which I >> can't see anywhere else. All the lines look fine in the citation of >>

Re: [PATCH 0/8] Resending sb/range-diff-colors

2018-08-13 Thread Stefan Beller
On Fri, Aug 10, 2018 at 3:34 PM Stefan Beller wrote: > > This is also avaliable as > git fetch https://github.com/stefanbeller/git sb/range-diff-colors > > and is a resend of sb/range-diff-colors. I thought about this series a bit, and I think we would want to break it up into 2: * the actual

Re: wishlist: "--cached|--staged" to "git commit file(s)"

2018-08-13 Thread Yaroslav Halchenko
On Mon, 13 Aug 2018, Junio C Hamano wrote: > > command. ATM there is no non-interactive (via --patch/--interactive I > > think it is possible) way to commit selected subset of staged files not > > from the worktree (as it is done with "git commit file(s)") but from the > > index. > Hmph, so >

Re: [PATCH v2 5/5] list-objects-filter: implement filter tree:none

2018-08-13 Thread Matthew DeVore
On Mon, Aug 13, 2018 at 9:38 AM Jeff Hostetler wrote: > > > > On 8/10/2018 7:06 PM, Matthew DeVore wrote: > > Teach list-objects the "tree:none" filter which allows for filtering > > out all tree and blob objects (unless other objects are explicitly > > specified by the user). The purpose of this

Re: [PATCH v2 5/5] list-objects-filter: implement filter tree:none

2018-08-13 Thread Matthew DeVore
On Mon, Aug 13, 2018 at 11:29 AM Jonathan Tan wrote: > > > - case LOFS_BEGIN_TREE: > > - assert(obj->type == OBJ_TREE); > > - /* always include all tree objects */ > > - return LOFR_MARK_SEEN | LOFR_DO_SHOW; > > - > > case LOFS_END_TREE: > >

[PATCH 5/8] diff.c: add set_sign to emit_line_0

2018-08-13 Thread Stefan Beller
Split the meaning of the `set` parameter that is passed to emit_line_0()` to separate between the color of the "sign" (i.e. the diff marker '+', '-' or ' ' that is passed in as the `first` parameter) and the color of the rest of the line. This changes the meaning of the `set` parameter to no

[PATCHv2 0/8] Resending sb/range-diff-colors

2018-08-13 Thread Stefan Beller
This is also avaliable as git fetch https://github.com/stefanbeller/git sb/range-diff-colors This applies on top of js/range-diff (a7be92acd9600), this version * resolves a semantic conflict in the test (Did range-diff change its output slightly?) * addressed Johannes feedback, such as ->

[PATCH 2/8] t3206: add color test for range-diff --dual-color

2018-08-13 Thread Stefan Beller
The 'expect'ed outcome has been taken by running the 'range-diff | decode'. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- t/t3206-range-diff.sh | 39 +++ 1 file changed, 39 insertions(+) diff --git a/t/t3206-range-diff.sh

  1   2   3   >