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

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(>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 ---

[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

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

[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.

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

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

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

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

[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(+)

[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

[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

[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:

[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

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

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

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

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

[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

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

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

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

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 >

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"

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

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

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

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

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

[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

[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

[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

[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):

[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

[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

[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)

[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 ---

[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(+),

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

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

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

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

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

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; > +

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

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

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

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

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

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

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

[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

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

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

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

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

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

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

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

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."

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 > >>

[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 ---

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 () { > +

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'

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

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

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: > >

[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 ---

[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

[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

[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

[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

[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

[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 @@

[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

[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

[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

[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

[PATCH 07/12] packfile: allow prepare_packed_git_one 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 | 7 +++ 1 file changed, 3

[PATCH 09/12] packfile: allow reprepare_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 packfile.h | 3 +--

Re: [RFC PATCH v3 3/9] Indent function git_rebase__interactive

2018-03-23 Thread Johannes Schindelin
Hi Wink, On Thu, 22 Mar 2018, Wink Saville wrote: > Signed-off-by: Wink Saville > --- > git-rebase--interactive.sh | 432 > ++--- It cannot be helped (at least for now) that this indent change produces such a large diff. I am fine

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

2018-03-23 Thread Johannes Schindelin
Hi Wink, On Thu, 22 Mar 2018, Wink Saville wrote: > Use initiate_action, setup_reflog_action, init_basic_state, > init_revisions_and_shortrevisions and complete_action. > > Signed-off-by: Wink Saville > --- > git-rebase--interactive.sh | 187 >

[ANNOUNCE] Git for Windows 2.16.3

2018-03-23 Thread Johannes Schindelin
Dear Git users, It is my pleasure to announce that Git for Windows 2.16.3 is available from: https://gitforwindows.org/ Changes since Git for Windows v2.16.2 (February 20th 2018) New Features * Comes with Git v2.16.3. * When choosing to "Use Git from the Windows Command Prompt"

Re: [PATCH] completion: clear cached --options when sourcing the completion script

2018-03-23 Thread Junio C Hamano
Junio C Hamano writes: > SZEDER Gábor writes: > >> Hang on, this test fails in the GETTEXT_POISON build. > > Thanks. > >> The thing is, we get the merge strategies with this piece of code in >> __git_list_merge_strategies() in master: >> >> LANG=C

Re: [PATCH] completion: clear cached --options when sourcing the completion script

2018-03-23 Thread Junio C Hamano
SZEDER Gábor writes: > Hang on, this test fails in the GETTEXT_POISON build. Thanks. > The thing is, we get the merge strategies with this piece of code in > __git_list_merge_strategies() in master: > > LANG=C LC_ALL=C git merge -s help 2>&1 | > sed -n -e

[PATCH 01/27] repository: introduce raw object store field

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller The raw object store field will contain any objects needed for access to objects in a given repository. This patch introduces the raw object store and populates it with the `objectdir`, which used to be part of the repository struct. As the struct gains

[PATCH 05/27] object-store: move packed_git and packed_git_mru to object store

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. [nd: while at there, wrap

[PATCH 07/27] pack: move prepare_packed_git_run_once to object store

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Each repository's object store can be initialized independently, so they must not share a run_once variable. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH 06/27] object-store: close all packs upon clearing the object store

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 --- builtin/am.c | 2 +- builtin/clone.c| 2 +- builtin/fetch.c| 2 +-

[PATCH 13/27] sha1_file: add repository argument to prepare_alt_odb

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: Jonathan Nieder Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy ---

[PATCH 09/27] sha1_file: add raw_object_store argument to alt_odb_usable

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Add a raw_object_store to alt_odb_usable to be more specific about which repository to act on. The choice of the repository is delegated to its only caller link_alt_odb_entry. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

[PATCH 11/27] sha1_file: add repository argument to read_info_alternates

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: Jonathan Nieder Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH 19/27] sha1_file: add repository argument to map_sha1_file_1

2018-03-23 Thread Nguyễn Thái Ngọc Duy
From: Stefan Beller Add a repository argument to allow the map_sha1_file_1 caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the

  1   2   >