Re: [PATCH v6 00/11] nd/pack-objects-pack-struct updates

2018-03-23 Thread Jeff King
On Fri, Mar 23, 2018 at 04:01:50PM +, Ramsay Jones wrote: > Not that it matters, but I assume this was something like: > > $ time (echo HEAD | git cat-file --batch-check="%(objectsize:disk)") > > ... and I suspect it was on the linux.git repo, yes? Yes to both. > If I do this on my bigge

[PATCH v7 03/13] pack-objects: use bitfield for object_entry::dfs_state

2018-03-23 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 3 +++ pack-objects.h | 28 +--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 647c01ea34..83f8154865 100644 --- a/builtin/pac

[PATCH v7 12/13] pack-objects: shrink delta_size field in struct object_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
Allowing a delta size of 64 bits is crazy. Shrink this field down to 31 bits with one overflow bit. If we find an existing delta larger than 2GB, we do not cache delta_size at all and will get the value from oe_size(), potentially from disk if it's larger than 4GB. Note, since DELTA_SIZE() is use

[PATCH v7 11/13] pack-objects: shrink size field in struct object_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
It's very very rare that an uncompressed object is larger than 4GB (partly because Git does not handle those large files very well to begin with). Let's optimize it for the common case where object size is smaller than this limit. Shrink size field down to 32 bits [1] and one overflow bit. If the

[PATCH v7 09/13] pack-objects: don't check size when the object is bad

2018-03-23 Thread Nguyễn Thái Ngọc Duy
sha1_object_info() in check_objects() may fail to locate an object in the pack and return type OBJ_BAD. In that case, it will likely leave the "size" field untouched. We delay error handling until later in prepare_pack() though. Until then, do not touch "size" field. This field should contain the

[PATCH v7 06/13] pack-objects: move in_pack out of struct object_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
Instead of using 8 bytes (on 64 bit arch) to store a pointer to a pack. Use an index instead since the number of packs should be relatively small. This limits the number of packs we can handle to 1k. Since we can't be sure people can never run into the situation where they have more than 1k pack f

[PATCH v7 08/13] pack-objects: shrink z_delta_size field in struct object_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
We only cache deltas when it's smaller than a certain limit. This limit defaults to 1000 but save its compressed length in a 64-bit field. Shrink that field down to 16 bits, so you can only cache 65kb deltas. Larger deltas must be recomputed at when the pack is written down. Signed-off-by: Nguyễn

[PATCH v7 07/13] pack-objects: refer to delta objects by index instead of pointer

2018-03-23 Thread Nguyễn Thái Ngọc Duy
These delta pointers always point to elements in the objects[] array in packing_data struct. We can only hold maximum 4G of those objects because the array size in nr_objects is uint32_t. We could use uint32_t indexes to address these elements instead of pointers. On 64-bit architecture (8 bytes pe

[PATCH v7 05/13] pack-objects: move in_pack_pos out of struct object_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
This field is only need for pack-bitmap, which is an optional feature. Move it to a separate array that is only allocated when pack-bitmap is used (it's not freed in the same way that objects[] is not). Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 3 ++- pack-bitmap-write.c

[PATCH v7 02/13] pack-objects: turn type and in_pack_type to bitfields

2018-03-23 Thread Nguyễn Thái Ngọc Duy
An extra field type_valid is added to carry the equivalent of OBJ_BAD in the original "type" field. in_pack_type always contains a valid type so we only need 3 bits for it. A note about accepting OBJ_NONE as "valid" type. The function read_object_list_from_stdin() can pass this value [1] and it ev

[PATCH v7 10/13] pack-objects: clarify the use of object_entry::size

2018-03-23 Thread Nguyễn Thái Ngọc Duy
While this field most of the time contains the canonical object size, there is one case it does not: when we have found that the base object of the delta in question is also to be packed, we will very happily reuse the delta by copying it over instead of regenerating the new delta. "size" in this

[PATCH v7 04/13] pack-objects: use bitfield for object_entry::depth

2018-03-23 Thread Nguyễn Thái Ngọc Duy
Because of struct packing from now on we can only handle max depth 4095 (or even lower when new booleans are added in this struct). This should be ok since long delta chain will cause significant slow down anyway. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 1 +

[PATCH v7 00/13] nd/pack-objects-pack-struct updates

2018-03-23 Thread Nguyễn Thái Ngọc Duy
Phew.. pack-objects is tough to crack. v7 changes - the 16k pack limit is removed thanks to Jeff suggestion. The limit for memory saving though is reduced down to 1k again. - only object size below 2G is cached (previously 4G) to avoid 1 << 32 on 32 bits. - fix oe_size() retrieving wrong size

[PATCH v7 13/13] pack-objects: reorder members to shrink struct object_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
Previous patches leave lots of holes and padding in this struct. This patch reorders the members and shrinks the struct down to 80 bytes (from 136 bytes, before any field shrinking is done) with 16 bits to spare (and a couple more in in_pack_header_size when we really run out of bits). This is the

[PATCH v7 01/13] pack-objects: a bit of document about struct object_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
The role of this comment block becomes more important after we shuffle fields around to shrink this struct. It will be much harder to see what field is related to what. Signed-off-by: Nguyễn Thái Ngọc Duy --- pack-objects.h | 45 + 1 file changed, 45 i

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Loganaden Velvindron
On Sat, Mar 24, 2018 at 1:47 AM, Daniel Stenberg wrote: > On Fri, 23 Mar 2018, Loganaden Velvindron wrote: > >> +#ifdef CURL_SSLVERSION_TLSv1_3 >> + { "tlsv1.3", CURL_SSLVERSION_TLSv1_3 } >> +#endif > > > Unfortunately, CURL_SSLVERSION_TLSv1_3 is an enum so this construct won't > work. > > A

Re: [RFC PATCH v5 0/8] rebase-interactive

2018-03-23 Thread Wink Saville
>> I queued everything (with all patch 3-8/8 retitled to share a >> common prefix, so that "git shortlog" output would stay sane) >> and I think I resolved the conflicts with Dscho's recreate-merges >> topic correctly. Please double check what will appear on 'pu' later >> today. >> >> Thanks. >> >

[RFC PATCH 1/1] json-writer: incorrect format specifier

2018-03-23 Thread Wink Saville
In routines jw_object_uint64 and jw_object_double strbuf_addf is invoked with strbuf_addf(&jw->json, ":%"PRIuMAX, value) where value is a uint64_t. This causes a compile error on OSX. The correct format specifier is PRIu64 instead of PRIuMax. Signed-off-by: Wink Saville --- json-writer.c | 4 ++

[RFC PATCH 0/1] json-writer: incorrect format specifier

2018-03-23 Thread Wink Saville
Building the pu branch at commit 8b49f5c076c using Travis-CI all of the linux builds are green but the two OSX builds are red[1] and the logs show compile errors: CC ident.o CC json-writer.o json-writer.c:123:38: error: format specifies type 'uintmax_t' (aka 'unsigned long') but the ar

Re: [PATCH 00/27] sb/object-store updates

2018-03-23 Thread Duy Nguyen
On Fri, Mar 23, 2018 at 06:07:33PM -0400, Eric Sunshine wrote: > On Fri, Mar 23, 2018 at 1:20 PM, Nguyễn Thái Ngọc Duy > wrote: > > Interdiff is big due to the "objects." to "objects->" conversion > > (blame Brandon for his suggestion, don't blame me :D) > > > > diff --git a/packfile.c b/packfile

[GSoC] Info: git log --oneline improvements

2018-03-23 Thread Pratik Karki
Hi Christian and Johannes, I will like to send another proposal on git log --oneline improvements. My first proposal[1] was on "Convert scripts to builtins". Can you provide me information about "git log --online improvements" and point me to resources where I should focus on my proposal. [1]:

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Loganaden Velvindron
On Sat, Mar 24, 2018 at 1:47 AM, Daniel Stenberg wrote: > On Fri, 23 Mar 2018, Loganaden Velvindron wrote: > >> +#ifdef CURL_SSLVERSION_TLSv1_3 >> + { "tlsv1.3", CURL_SSLVERSION_TLSv1_3 } >> +#endif > > > Unfortunately, CURL_SSLVERSION_TLSv1_3 is an enum so this construct won't > work. > > A

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Loganaden Velvindron
On Sat, Mar 24, 2018 at 1:55 AM, Junio C Hamano wrote: > Loganaden Velvindron writes: > >> Subject: Re: [PATCH v2] Allow use of TLS 1.3 > > Let's retitle it to something like > > Subject: [PATCH v2] http: allow use of TLS 1.3 > >> Add a tlsv1.3 option to http.sslVersion in addition to the

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Loganaden Velvindron
On Sat, Mar 24, 2018 at 1:47 AM, Daniel Stenberg wrote: > On Fri, 23 Mar 2018, Loganaden Velvindron wrote: > >> +#ifdef CURL_SSLVERSION_TLSv1_3 >> + { "tlsv1.3", CURL_SSLVERSION_TLSv1_3 } >> +#endif > > > Unfortunately, CURL_SSLVERSION_TLSv1_3 is an enum so this construct won't > work. > > A

Re: [ANNOUNCE] Git v2.17.0-rc1

2018-03-23 Thread Bryan Turner
On Fri, Mar 23, 2018 at 10:47 AM, Johannes Schindelin wrote: > Hi team, > > On Wed, 21 Mar 2018, Junio C Hamano wrote: > >> A release candidate Git v2.17.0-rc1 is now available for testing >> at the usual places. It is comprised of 493 non-merge commits >> since v2.16.0, contributed by 62 people,

[PATCH v2 3/4] config.c: introduce 'git_config_color' to parse ANSI colors

2018-03-23 Thread Taylor Blau
In preparation for adding `--color` to the `git-config(1)` builtin, let's introduce a color parsing utility, `git_config_color` in a similar fashion to `git_config_`. Signed-off-by: Taylor Blau --- config.c | 10 ++ config.h | 1 + 2 files changed, 11 insertions(+) diff --git a/config.

[PATCH v2 1/4] builtin/config: introduce `--default`

2018-03-23 Thread Taylor Blau
For some use cases, callers of the `git-config(1)` builtin would like to fallback to default values when the slot asked for does not exist. In addition, users would like to use existing type specifiers to ensure that values are parsed correctly when they do exist in the configuration. For example,

[PATCH v2 4/4] builtin/config: introduce `--color` type specifier

2018-03-23 Thread Taylor Blau
As of this commit, the canonical way to retreive an ANSI-compatible color escape sequence from a configuration file is with the `--get-color` action. This is to allow Git to "fall back" on a default value for the color should the given section not exist in the specified configuration(s). With the

[PATCH v2 0/4] Teach `--default` to `git-config(1)`

2018-03-23 Thread Taylor Blau
Hi, Attached is 'v2' of my patch series to add a `--default` option to `git config`. I have addressed the following concerns since the first iteration: 1. Better motivation in 'builtin/config: introduce `--default`'. (cc: Peff, Eric) 2. Fixed a typo in the message of 'builtin/config: intr

[PATCH v2 2/4] Documentation: list all type specifiers in config prose

2018-03-23 Thread Taylor Blau
The documentation for the `git-config(1)` builtin has not been recently updated to include new types, such as `--bool-or-int`, and `--expiry-date`. To ensure completeness when adding a new type specifier, let's update the existing documentation to include the new types. Since this paragraph is gro

Re: [RFC PATCH v5 3/8] Indent function git_rebase__interactive

2018-03-23 Thread Wink Saville
> I actually do not care if line-wrapping is done; it is perfectly > fine to leave it for future clean-up and leave it outside the scope > of this series. If you are going to do as a part of the series, > yes, I do prefer you limit yourself to those lines that are involved > in the series in some

Re: [PATCH] Allow use of TLS 1.3

2018-03-23 Thread Johannes Schindelin
Hi, On Fri, 23 Mar 2018, Loganaden Velvindron wrote: > On Fri, Mar 23, 2018 at 07:37:08PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > > On Fri, Mar 23 2018, Loganaden Velvindron wrote: > > > > > Done during IETF 101 hackathon > > > > Hi. Thanks. Let's add a meaningful commit message to this th

Re: [RFC PATCH v5 3/8] Indent function git_rebase__interactive

2018-03-23 Thread Junio C Hamano
Wink Saville writes: > Also, I assume you want me to only change lines in > git_rebase__interactive. I actually do not care if line-wrapping is done; it is perfectly fine to leave it for future clean-up and leave it outside the scope of this series. If you are going to do as a part of the serie

Re: [RFC PATCH v5 0/8] rebase-interactive

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 3:39 PM, Junio C Hamano wrote: > Wink Saville writes: > >> On Fri, Mar 23, 2018 at 2:25 PM, Wink Saville wrote: >>> Reworked patch 1 so that all of the backend scriptlets >>> used by git-rebase use a normal function style invocation. >>> >>> Merged the previous patch 2 an

Re: [RFC PATCH v5 3/8] Indent function git_rebase__interactive

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 3:12 PM, Junio C Hamano wrote: > Wink Saville writes: > >> Signed-off-by: Wink Saville >> --- >> git-rebase--interactive.sh | 432 >> ++--- >> 1 file changed, 215 insertions(+), 217 deletions(-) > > Thanks for separating this step

[PATCH v2] branch: implement shortcut to delete last branch

2018-03-23 Thread Aaron Greenberg
I updated the commit message to include my first email's cover letter and cleaned up the test. Copying Junio, since he also had good comments in the conversation you linked. I can appreciate Matthieu's points on the use of "-" in destructive commands. As of this writing, git-merge supports the "

[PATCH] branch: implement shortcut to delete last branch

2018-03-23 Thread Aaron Greenberg
This patch gives git-branch the ability to delete the previous checked-out branch using the "-" shortcut. This shortcut already exists for git-checkout, git-merge, and git-revert. A common workflow is 1. Do some work on a local topic-branch and push it to a remote. 2. 'remote/topic-branch' gets me

Re: [RFC PATCH v5 0/8] rebase-interactive

2018-03-23 Thread Junio C Hamano
Wink Saville writes: > On Fri, Mar 23, 2018 at 2:25 PM, Wink Saville wrote: >> Reworked patch 1 so that all of the backend scriptlets >> used by git-rebase use a normal function style invocation. >> >> Merged the previous patch 2 and 3 have been squashed which >> provides reviewers a little easi

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 23 2018, Junio C. Hamano wrote: >> @@ -62,6 +62,9 @@ static struct { >> { "tlsv1.1", CURL_SSLVERSION_TLSv1_1 }, >> { "tlsv1.2", CURL_SSLVERSION_TLSv1_2 }, >> #endif >> +#ifdef CURL_SSLVERSION_TLSv1_3 >> +{ "tlsv1.3", CURL_SSLVERSION_TLSv1_3 } >> +#endif >> }; > > It se

Re: [RFC PATCH v5 0/8] rebase-interactive

2018-03-23 Thread Junio C Hamano
Wink Saville writes: > Wink Saville (8): > rebase-interactive: simplify pick_on_preserving_merges > rebase: update invocation of rebase dot-sourced scripts > Indent function git_rebase__interactive > Extract functions out of git_rebase__interactive > Add and use git_rebase__interactive_

Re: [RFC PATCH v5 4/8] Extract functions out of git_rebase__interactive

2018-03-23 Thread Junio C Hamano
Wink Saville writes: > The extracted functions are: > - initiate_action > - setup_reflog_action > - init_basic_state > - init_revisions_and_shortrevisions > - complete_action > > Used by git_rebase__interactive > > Signed-off-by: Wink Saville > Helped-by: Junio C Hamano > Helped-by: J

Re: [RFC PATCH v5 3/8] Indent function git_rebase__interactive

2018-03-23 Thread Junio C Hamano
Wink Saville writes: > Signed-off-by: Wink Saville > --- > git-rebase--interactive.sh | 432 > ++--- > 1 file changed, 215 insertions(+), 217 deletions(-) Thanks for separating this step out. "git show -w --stat -p" tells us that this is a pure re-inde

Re: [PATCH 00/27] sb/object-store updates

2018-03-23 Thread Eric Sunshine
On Fri, Mar 23, 2018 at 1:20 PM, Nguyễn Thái Ngọc Duy wrote: > Interdiff is big due to the "objects." to "objects->" conversion > (blame Brandon for his suggestion, don't blame me :D) > > diff --git a/packfile.c b/packfile.c > @@ -1938,7 +1939,7 @@ static int add_promisor_object(const struct objec

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Junio C Hamano
Daniel Stenberg writes: > On Fri, 23 Mar 2018, Loganaden Velvindron wrote: > >> +#ifdef CURL_SSLVERSION_TLSv1_3 >> +{ "tlsv1.3", CURL_SSLVERSION_TLSv1_3 } >> +#endif > > Unfortunately, CURL_SSLVERSION_TLSv1_3 is an enum so this construct > won't work. > > Also, let me just point out that 7.52

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Junio C Hamano
Loganaden Velvindron writes: > Subject: Re: [PATCH v2] Allow use of TLS 1.3 Let's retitle it to something like Subject: [PATCH v2] http: allow use of TLS 1.3 > Add a tlsv1.3 option to http.sslVersion in addition to the existing > tlsv1.[012] options. libcurl has supported this since 7

Re: [PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Daniel Stenberg
On Fri, 23 Mar 2018, Loganaden Velvindron wrote: +#ifdef CURL_SSLVERSION_TLSv1_3 + { "tlsv1.3", CURL_SSLVERSION_TLSv1_3 } +#endif Unfortunately, CURL_SSLVERSION_TLSv1_3 is an enum so this construct won't work. Also, let me just point out that 7.52.0 is 0x073400 in hex and not the one

Re: [RFC PATCH v5 0/8] rebase-interactive

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 2:25 PM, Wink Saville wrote: > Reworked patch 1 so that all of the backend scriptlets > used by git-rebase use a normal function style invocation. > > Merged the previous patch 2 and 3 have been squashed which > provides reviewers a little easier time to detect any changes

Re: [PATCH 00/27] sb/object-store updates

2018-03-23 Thread Junio C Hamano
Brandon Williams writes: >> > Interdiff is big due to the "objects." to "objects->" conversion >> > (blame Brandon for his suggestion, don't blame me :D) >> >> Haha, I'm guessing you prefer having a pointer too then? :P >> >> The interdiff looks good, though I'll set some time aside today to g

[RFC PATCH v5 1/8] rebase-interactive: simplify pick_on_preserving_merges

2018-03-23 Thread Wink Saville
Use compound if statement instead of nested if statements to simplify pick_on_preserving_merges. Signed-off-by: Wink Saville --- git-rebase--interactive.sh | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.

[RFC PATCH v5 6/8] Remove unused code paths from git_rebase__interactive

2018-03-23 Thread Wink Saville
Since git_rebase__interactive is now never called with $preserve_merges = t we can remove those code paths. Signed-off-by: Wink Saville --- git-rebase--interactive.sh | 95 ++ 1 file changed, 4 insertions(+), 91 deletions(-) diff --git a/git-rebase--i

[RFC PATCH v5 0/8] rebase-interactive

2018-03-23 Thread Wink Saville
Reworked patch 1 so that all of the backend scriptlets used by git-rebase use a normal function style invocation. Merged the previous patch 2 and 3 have been squashed which provides reviewers a little easier time to detect any changes during extraction of the functions. Wink Saville (8): rebase

[RFC PATCH v5 5/8] Add and use git_rebase__interactive__preserve_merges

2018-03-23 Thread Wink Saville
At the moment it's an exact copy of git_rebase__interactive except the name has changed. Signed-off-by: Wink Saville --- git-rebase--interactive.sh | 108 + git-rebase.sh | 2 +- 2 files changed, 109 insertions(+), 1 deletion(-) diff --

[RFC PATCH v5 8/8] Remove merges_option and a blank line

2018-03-23 Thread Wink Saville
merges_option is unused in git_rebase__interactive and always empty in git_rebase__interactive__preserve_merges so it can be removed. Signed-off-by: Wink Saville --- git-rebase--interactive.sh | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/git-rebase--interactive.s

[RFC PATCH v5 3/8] Indent function git_rebase__interactive

2018-03-23 Thread Wink Saville
Signed-off-by: Wink Saville --- git-rebase--interactive.sh | 432 ++--- 1 file changed, 215 insertions(+), 217 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 213d75f43..a79330f45 100644 --- a/git-rebase--interactive

[RFC PATCH v5 7/8] Remove unused code paths from git_rebase__interactive__preserve_merges

2018-03-23 Thread Wink Saville
Since git_rebase__interactive__preserve_merges is now always called with $preserve_merges = t we can remove the unused code paths. Signed-off-by: Wink Saville --- git-rebase--interactive.sh | 152 - 1 file changed, 69 insertions(+), 83 deletions(-) di

[RFC PATCH v5 4/8] Extract functions out of git_rebase__interactive

2018-03-23 Thread Wink Saville
The extracted functions are: - initiate_action - setup_reflog_action - init_basic_state - init_revisions_and_shortrevisions - complete_action Used by git_rebase__interactive Signed-off-by: Wink Saville Helped-by: Junio C Hamano Helped-by: Johannes Schindelin --- git-rebase--interact

[RFC PATCH v5 2/8] rebase: update invocation of rebase dot-sourced scripts

2018-03-23 Thread Wink Saville
Due to historical reasons, the backend scriptlets for "git rebase" are structured a bit unusually. As originally designed, dot-sourcing them from "git rebase" was sufficient to invoke the specific backend. However, it was later discovered that some shell implementations (e.g. FreeBSD 9.x) misbehav

Re:

2018-03-23 Thread VIC J
-- I need your partnership to transfer $17.5 million to you and you will profit 40% of fund, details will be disclosed once i receive your positive reply.

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Eric Sunshine
On Fri, Mar 23, 2018 at 5:01 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> (despite the run-on sentence in the first paragraph and the apparent >> incorrect explanation of top-level "return" misbehavior -- the in-code >> comment says top-level "return" was essentially a no-op in broken >>

Re: [PATCH v1 0/2] perf/aggregate: sort result by regression

2018-03-23 Thread Junio C Hamano
Christian Couder writes: > This small patch series makes it easy to spot big performance > regressions, so that they can later be investigated. > > For example: > > $ ./aggregate.perl --sortbyregression --subsection "without libpcre" v2.14.3 > v2.15.1 v2.16.2 p4220-log-grep-engines.sh Are we c

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 1:51 PM, Junio C Hamano wrote: > Wink Saville writes: > >> Here is one possibility: >> >> git format-patch --cover-letter --rfc --thread -v 5 >> --to=git@vger.kernel.org --cc=sunsh...@sunshineco.com >> --cc=johannes.schinde...@gmx.de -o patches/v5 master..v5-2 > > Sounds s

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Junio C Hamano
Eric Sunshine writes: >> When it was discovered that some shell implementations > ... > ECANTPARSE: This paragraph is grammatically corrupt. > > ECANTPARSE: Grammatically corrupt. > ... > (despite the run-on sentence in the first paragraph and the apparent > incorrect explanation of top-level "re

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Junio C Hamano
Wink Saville writes: > Here is one possibility: > > git format-patch --cover-letter --rfc --thread -v 5 > --to=git@vger.kernel.org --cc=sunsh...@sunshineco.com > --cc=johannes.schinde...@gmx.de -o patches/v5 master..v5-2 Sounds sensible. > If this was the first version then the above would seem

Re: [PATCH v2 5/5] Expand implementation of mem-pool type

2018-03-23 Thread Junio C Hamano
Jameson Miller writes: > +void mem_pool_discard(struct mem_pool *mem_pool) > +{ > + struct mp_block *block, *block_to_free; > + for (block = mem_pool->mp_block; block;) > + { > + block_to_free = block; > + block = block->next_block; > + free(block_t

Re: [PATCH v2] json_writer: new routines to create data in JSON format

2018-03-23 Thread Jeff Hostetler
On 3/23/2018 4:11 PM, René Scharfe wrote: Am 23.03.2018 um 20:55 schrieb Jeff Hostetler: +struct json_writer_level +{ +    unsigned level_is_array : 1; +    unsigned level_is_empty : 1; +}; + +struct json_writer +{ +    struct json_writer_level *levels; +    int nr, alloc; +    struct strbuf j

Re: [PATCH v2 4/5] Move the reusable parts of memory pool into its own file

2018-03-23 Thread Junio C Hamano
Jameson Miller writes: > This moves the reusable parts of the memory pool logic used by > fast-import.c into its own file for use by other components. > > Signed-off-by: Jameson Miller > --- > Makefile | 1 + > fast-import.c | 118 > +-

Re: [PATCH v2] filter-branch: fix errors caused by refs that cannot be used with ^0

2018-03-23 Thread Junio C Hamano
Yuki Kokubun writes: > "git filter-branch -- --all" print unwanted error messages when refs that > cannot be used with ^0 exist. It is not incorrect per-se, but if I were writing this, I'd say "... when refs that point at objects that are not committish" or something like that, as that is much c

Re: [PATCH 00/12] sb/packfiles-in-repository updates

2018-03-23 Thread Brandon Williams
On 03/23, Nguyễn Thái Ngọc Duy wrote: > This is the rebased version on the updated sb/object-store I just sent > out plus the fix for get_object_directory(). The interdiff (after > rebased) looks small and nice Nice! Thanks for fixing that. This series looks good to me :) > > diff --git a/packf

Re: [PATCH v2] json_writer: new routines to create data in JSON format

2018-03-23 Thread René Scharfe
Am 23.03.2018 um 20:55 schrieb Jeff Hostetler: >>> +struct json_writer_level >>> +{ >>> +    unsigned level_is_array : 1; >>> +    unsigned level_is_empty : 1; >>> +}; >>> + >>> +struct json_writer >>> +{ >>> +    struct json_writer_level *levels; >>> +    int nr, alloc; >>> +    struct strbuf json

Re: [RFC PATCH v3 5/9] Use new functions in git_rebase__interactive

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 11:24 AM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> If you fold this into the previous patch, I am sure that after your 3/9 >> indenting the function properly, the splitting into functions will look >> more or less like this: >> >> -git_rebase__interactive (

Re: [PATCH v2] json_writer: new routines to create data in JSON format

2018-03-23 Thread Jeff Hostetler
On 3/23/2018 2:01 PM, René Scharfe wrote: Am 21.03.2018 um 20:28 schrieb g...@jeffhostetler.com: From: Jeff Hostetler Add basic routines to generate data in JSON format. Signed-off-by: Jeff Hostetler --- Makefile| 2 + json-writer.c | 321 ++

Re: [PATCH v3] routines to generate JSON data

2018-03-23 Thread Jeff Hostetler
On 3/23/2018 2:14 PM, Ramsay Jones wrote: On 23/03/18 16:29, g...@jeffhostetler.com wrote: From: Jeff Hostetler This is version 3 of my JSON data format routines. I have not looked at v3 yet - the patch below is against the version in 'pu' @3284f940c (presumably that would be v2). I b

[PATCH v2] Allow use of TLS 1.3

2018-03-23 Thread Loganaden Velvindron
Add a tlsv1.3 option to http.sslVersion in addition to the existing tlsv1.[012] options. libcurl has supported this since 7.52.0. Done during IETF 101 Hackathon Signed-off-by: Loganaden Velvindron --- Documentation/config.txt | 2 +- http.c | 3 +++ 2 files changed, 4 inserti

Re: user-manual: patch proposals and questions

2018-03-23 Thread kalle
thank you for your answer and hints. kalle Am 19.03.2018 um 01:27 schrieb Eric Sunshine: > On Sun, Mar 18, 2018 at 7:49 PM, kalle wrote: >> 1.I wonder, why the "user-manual" is so hidden on the (official?) site >> git-scm.com [it is accessible at git-scm.com/docs/user-manual ,but is >> not viewab

Re: [PATCH v3] json_writer: new routines to create data in JSON format

2018-03-23 Thread Jeff Hostetler
On 3/23/2018 1:18 PM, Jonathan Nieder wrote: g...@jeffhostetler.com wrote: From: Jeff Hostetler Add basic routines to generate data in JSON format. Signed-off-by: Jeff Hostetler If I understand the cover letter correctly, this is a JSON-like format, not actual JSON. Am I understanding

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 10:12 AM, Johannes Schindelin wrote: > Hi Wink, > > On Thu, 22 Mar 2018, Wink Saville wrote: > >> The backend scriptlets for "git rebase" were structured in a >> bit unusual way for historical reasons. Originally, it was >> designed in such a way that dot-sourcing them fro

Re: [PATCH 00/27] sb/object-store updates

2018-03-23 Thread Duy Nguyen
On Fri, Mar 23, 2018 at 7:35 PM, Brandon Williams wrote: > On 03/23, Nguyễn Thái Ngọc Duy wrote: >> I think I have addressed all comments I've received so far. What I >> decided not to do, I have responded individually. One comment I did >> not respond nor do is the approximate thing, which could

Re: [PATCH 00/27] sb/object-store updates

2018-03-23 Thread Brandon Williams
On 03/23, Brandon Williams wrote: > On 03/23, Nguyễn Thái Ngọc Duy wrote: > > I think I have addressed all comments I've received so far. What I > > decided not to do, I have responded individually. One comment I did > > not respond nor do is the approximate thing, which could be done > > later. >

Re: [PATCH 04/27] object-store: free alt_odb_list

2018-03-23 Thread Brandon Williams
On 03/23, Nguyễn Thái Ngọc Duy wrote: > From: Stefan Beller > > Free the memory and reset alt_odb_{list, tail} to NULL. > > Signed-off-by: Stefan Beller > Signed-off-by: Nguyễn Thái Ngọc Duy Thanks for fixing the memory leak. Looks good now. > --- > object.c | 22 ++ >

Re: [PATCH] Allow use of TLS 1.3

2018-03-23 Thread Loganaden Velvindron
On Fri, Mar 23, 2018 at 07:37:08PM +0100, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Mar 23 2018, Loganaden Velvindron wrote: > > > Done during IETF 101 hackathon > > Hi. Thanks. Let's add a meaningful commit message to this though, > something like: > > Add a tlsv1.3 option to http.sslVers

Re: [PATCH] Allow use of TLS 1.3

2018-03-23 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 23 2018, Loganaden Velvindron wrote: > Done during IETF 101 hackathon Hi. Thanks. Let's add a meaningful commit message to this though, something like: Add a tlsv1.3 option to http.sslVersion in addition to the existing tlsv1.[012] options. libcurl has supported this since 7

Re: [PATCH 00/27] sb/object-store updates

2018-03-23 Thread Brandon Williams
On 03/23, Nguyễn Thái Ngọc Duy wrote: > I think I have addressed all comments I've received so far. What I > decided not to do, I have responded individually. One comment I did > not respond nor do is the approximate thing, which could be done > later. > > Interdiff is big due to the "objects." to

Re: [PATCH 10/44] object-store: move packed_git and packed_git_mru to object store

2018-03-23 Thread Brandon Williams
On 03/23, Duy Nguyen wrote: > On Fri, Mar 23, 2018 at 6:03 PM, Duy Nguyen wrote: > > On Wed, Mar 21, 2018 at 11:18 PM, Brandon Williams > > wrote: > >> You're marking packed_git > >> as "private"...well C has no notion of private vs public fields in a > >> struct so it might be difficult to keep

[PATCH] Allow use of TLS 1.3

2018-03-23 Thread Loganaden Velvindron
Done during IETF 101 hackathon Signed-off-by: Loganaden Velvindron --- Documentation/config.txt | 1 + http.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index ce9102cea..f31d62772 100644 --- a/Documentation/config

Re: [RFC PATCH v3 5/9] Use new functions in git_rebase__interactive

2018-03-23 Thread Junio C Hamano
Johannes Schindelin writes: > If you fold this into the previous patch, I am sure that after your 3/9 > indenting the function properly, the splitting into functions will look > more or less like this: > > -git_rebase__interactive () { > +initiate_action () { > + action="$1" > > [...

Re: [PATCH v3] routines to generate JSON data

2018-03-23 Thread Ramsay Jones
On 23/03/18 16:29, g...@jeffhostetler.com wrote: > From: Jeff Hostetler > > This is version 3 of my JSON data format routines. I have not looked at v3 yet - the patch below is against the version in 'pu' @3284f940c (presumably that would be v2). The version in 'pu' broke my build on Linux, bu

Re: [PATCH v2] json_writer: new routines to create data in JSON format

2018-03-23 Thread René Scharfe
Am 21.03.2018 um 20:28 schrieb g...@jeffhostetler.com: > From: Jeff Hostetler > > Add basic routines to generate data in JSON format. > > Signed-off-by: Jeff Hostetler > --- > Makefile| 2 + > json-writer.c | 321 + > json-

Re: [ANNOUNCE] Git v2.17.0-rc1

2018-03-23 Thread Ævar Arnfjörð Bjarmason
On Wed, Mar 21 2018, Junio C. Hamano wrote: > A release candidate Git v2.17.0-rc1 is now available for testing > at the usual places. It is comprised of 493 non-merge commits > since v2.16.0, contributed by 62 people, 19 of which are new faces. I have this deployed on some tens of K machines wh

Re: [ANNOUNCE] Git v2.17.0-rc1

2018-03-23 Thread Johannes Schindelin
Hi team, On Wed, 21 Mar 2018, Junio C Hamano wrote: > A release candidate Git v2.17.0-rc1 is now available for testing > at the usual places. It is comprised of 493 non-merge commits > since v2.16.0, contributed by 62 people, 19 of which are new faces. > > The tarballs are found at: > > ht

[PATCH 06/12] packfile: add repository argument to reprepare_packed_git

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller See previous patch for explanation. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/gc.c | 2 +- builtin/receive-pack.c | 3 ++- bulk-checkin.c | 3 ++- fetch-pack.

[PATCH 05/12] packfile: add repository argument to prepare_packed_git

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Add a repository argument to allow prepare_packed_git callers to be more specific about which repository to handle. See commit "sha1_file: add repository argument to link_alt_odb_entry" for an explanation of the #define trick. Signed-off-by: Stefan Beller Signed-off-by: Nguy

[PATCH 03/12] packfile: allow install_packed_git to handle arbitrary repositories

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller This conversion was done without the #define trick used in the earlier series refactoring to have better repository access, because this function is easy to review, as it only has one caller and all lines but the first two are converted. We must not convert 'pack_open_fds' to

[PATCH 02/12] packfile: allow rearrange_packed_git to handle arbitrary repositories

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- packfile.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packfile.c b/packfile.c index 8c335bdcd1..bff22a8c81 100

[PATCH 08/12] packfile: allow prepare_packed_git to handle arbitrary repositories

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy --- packfile.c | 18 +- packfile.h | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packfile.c b/packfile.c index f49902539b..ad90c61422

[PATCH 04/12] packfile: add repository argument to prepare_packed_git_one

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- packfile.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packfile.c b/packfile.c index ff302142c7..0e5fa67526 1006

[PATCH 12/12] packfile: keep prepare_packed_git() private

2018-03-23 Thread Nguyễn Thái Ngọc Duy
The reason callers have to call this is to make sure either packed_git or packed_git_mru pointers are initialized since we don't do that by default. Sometimes it's hard to see this connection between where the function is called and where packed_git pointer is used (sometimes in separate functions)

[PATCH 11/12] packfile: allow find_pack_entry to handle arbitrary repositories

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- packfile.c | 11 +-- packfile.h | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packfile.c b/packfile.c index

[PATCH 01/12] packfile: allow prepare_packed_git_mru to handle arbitrary repositories

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller This conversion was done without the #define trick used in the earlier series refactoring to have better repository access, because this function is easy to review, as all lines are converted and it has only one caller Signed-off-by: Stefan Beller Signed-off-by: Junio C Hama

[PATCH 00/12] sb/packfiles-in-repository updates

2018-03-23 Thread Nguyễn Thái Ngọc Duy
This is the rebased version on the updated sb/object-store I just sent out plus the fix for get_object_directory(). The interdiff (after rebased) looks small and nice diff --git a/packfile.c b/packfile.c index e02136bebb..63c89ee31a 100644 --- a/packfile.c +++ b/packfile.c @@ -890,7 +890,7 @@ stat

[PATCH 10/12] packfile: add repository argument to find_pack_entry

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller While at it move the documentation to the header and mention which pack files are searched. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- packfile.c | 8 ++-- packfile.h | 7 ++-

  1   2   >