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

2018-10-15 Thread Junio C Hamano
Rasmus Villemoes writes: >> I wonder if it would make it easier to grok if we made the logic >> inside out, i.e. >> >> if ($sc eq $sender) { >> ... >> } else { >> if ($what =~ /^Signed-off-by$/i) { >> next if $suppress_cc{'sob'}; >>

Re: [PATCH v2 06/13] Add a build definition for Azure DevOps

2018-10-15 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > Also, we make use of the shiny new feature we just introduced where the > test suite can output JUnit-style .xml files. This information is made > available in a nice UI that allows the viewer to filter by phase and/or > test number, and to see

Re: [PATCH v2 01/13] ci: rename the library of common functions

2018-10-15 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > The name is hard-coded to reflect that we use Travis CI for continuous > testing. > > In the next commits, we will extend this to be able use Azure DevOps, > too. > > So let's adjust the name to make it more generic.

Re: [PATCH] submodule helper: convert relative URL to absolute URL if needed

2018-10-15 Thread Junio C Hamano
Jonathan Nieder writes: >> git config submodule.active . >> git submodule update >> fatal: repository '../plugins/codemirror-editor' does not exist >> fatal: clone of '../plugins/codemirror-editor' into submodule path >> '/tmp/gerrit/plugins/codemirror-editor' failed >> Failed to clone

Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'

2018-10-15 Thread Junio C Hamano
Junio C Hamano writes: > Christian Hesse writes: > >> Junio C Hamano on Wed, 2018/10/10 11:26: >>> As 'contrib' material without real maintenance, I do not care too >>> deeply, but shouldn't this change be more like this to avoid >>> duplicating the list of targets? >> >> Probably, yes. >> Do

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Junio C Hamano
Johannes Schindelin writes: > AFAIR Junio does not push to github.com/git/git, it is an automatic > mirror. > > GitLab could easily do the same. It used to be in the early days but these days git/git and gitster/git are updated in a same for loop that pushes to various destinations. You are

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > I have not reviewed this in any detail, but incorporating this in some > form or other seems like a no-brainer to me. > > If we have "free" (from the perspective of the project) CPU being > offered by various CI setups let's use it. Somebody else said in a

Re: [PATCH 0/4] Bloom filter experiment

2018-10-15 Thread Junio C Hamano
Derrick Stolee writes: > 2. The filters are sized according to the number of changes in each > commit, with a minimum of one 64-bit word. > ... > 6. When we compute the Bloom filters, we don't store a filter for > commits whose first-parent diff has more than 512 paths. Just being curious but

Re: [PATCHv2 0/3] git-p4: improved unshelving - small fixes

2018-10-15 Thread Junio C Hamano
Luke Diamand writes: > This is the same as my earlier patch other than fixing the > documentation to reflect the change to the destination branch, > as noticed by Junio. Also you set up when-finished driver for clean-up before running clone, which I think is a good change, too. Will replace.

Re: [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

2018-10-15 Thread Junio C Hamano
"Brendan Forster via GitGitGadget" writes: > Note: an earlier iteration tried to use the config setting > http.schannel.checkRevoke, but the http.* config settings can be limited > to specific URLs via http..* (which would mistake `schannel` for a > URL). Yeah, "http.schannel.anything" would

Re: [PATCH v2 00/13] Base SHA-256 implementation

2018-10-15 Thread Junio C Hamano
"brian m. carlson" writes: > t/t0014-hash.sh | 54 > create mode 100755 t/t0014-hash.sh If I am not mistaken, 0014 is already used by another topic in flight, and will cause test-lint failure on 'pu'.

Re: [PATCH 3/3] mingw: use domain information for default email

2018-10-15 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > +char *mingw_query_user_email(void) > +{ > + return get_extended_user_info(NameUserPrincipal); > +} > + > ... > > +#ifndef query_user_email > +#define query_user_email() NULL > +#endif The three patches look sensible to me; will queue. You

Re: [PATCH v2 12/13] README: add a build badge (status of the Azure Pipelines build)

2018-10-15 Thread Eric Sunshine
On Mon, Oct 15, 2018 at 6:12 AM Johannes Schindelin via GitGitGadget wrote: > Just like so many other OSS projects, we now also have a build badge. > > Signed-off-by: Johannes Schindelin > --- > diff --git a/README.md b/README.md > @@ -1,3 +1,5 @@ > +[![Build >

Re: [PATCH v10 00/21] Convert "git stash" to C builtin

2018-10-15 Thread Junio C Hamano
Thomas Gummerer writes: > On 10/15, Paul-Sebastian Ungureanu wrote: >> Hello, >> >> This is a new iteration of `git stash`, based on the last review. >> This iteration fixes some code styling issues, bring some changes >> to `do_push_stash()` and `do_create_stash()` to be closer to API by >>

Re: [PATCH v2 09/13] git-p4: use `test_atexit` to kill the daemon

2018-10-15 Thread Eric Sunshine
On Mon, Oct 15, 2018 at 6:12 AM Johannes Schindelin via GitGitGadget wrote: > This should be more reliable than the current method, and prepares the > test suite for a consistent way to clean up before re-running the tests > with different options. > > Signed-off-by: Johannes Schindelin > --- >

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-15 Thread Taylor Blau
On Mon, Oct 15, 2018 at 04:55:25PM +0200, Johannes Schindelin wrote: > Hi Taylor, > > On Mon, 15 Oct 2018, Taylor Blau wrote: > > > Thanks for putting this together, and offering to build Git on Azure > > Pipelines. I haven't followed v1 of this series very closely, so please > > excuse me if my

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

2018-10-15 Thread Junio C Hamano
Elijah Newren writes: > Would you like me to edit the commit message to include this more > difficult case? Neither. If the "marker length" change is required in a separate series that will build on top of the current 4-patch series, I think dropping this step from the current series and make

Re: [PATCH v3] gpg-interface.c: detect and reject multiple signatures on commits

2018-10-15 Thread Junio C Hamano
Michał Górny writes: >> OK, so the whole thing makes sense to me. >> >> Having said that, if we wanted to short-circuit, I think >> >> for (each line) { >> for (each sigcheck_gpg_status[]) { >> if (not the one on line) >>

Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'

2018-10-15 Thread Junio C Hamano
Christian Hesse writes: > Junio C Hamano on Wed, 2018/10/10 11:26: >> As 'contrib' material without real maintenance, I do not care too >> deeply, but shouldn't this change be more like this to avoid >> duplicating the list of targets? > > Probably, yes. > Do you want to add this yourself or do

Re: [PATCH v2 00/13] Base SHA-256 implementation

2018-10-15 Thread Junio C Hamano
"brian m. carlson" writes: > I realize the increase to GIT_MAX_HEXSZ will result in an increase in > memory usage, but we're going to need to do it at some point, and the > sooner the code is in the codebase, the sooner people can play around > with it and test it. Thanks.

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

2018-10-15 Thread Junio C Hamano
"brian m. carlson" writes: > Since the commit-graph code wants to serialize the hash algorithm into > the data store, specify a version number for each supported algorithm. > Note that we don't use the values of the constants themselves, as they > are internal and could change in the future. > >

Re: [PATCH v2 03/13] hex: introduce functions to print arbitrary hashes

2018-10-15 Thread Junio C Hamano
"brian m. carlson" writes: > diff --git a/cache.h b/cache.h > index d508f3d4f8..a13d14ce0a 100644 > --- a/cache.h > +++ b/cache.h > @@ -1361,9 +1361,9 @@ extern int get_oid_hex(const char *hex, struct > object_id *sha1); > extern int hex_to_bytes(unsigned char *binary, const char *hex, size_t

Working test 5

2018-10-15 Thread Judy
Did you get my email from last week? Let me know if you have photos for cutting out or retouching? We are an image team who can do editing for your the web store photos, industry photos or portrait photos. Send photos, we will do testing for you to check quality. Waiting for your reply soon.

Re: [PATCH] submodule helper: convert relative URL to absolute URL if needed

2018-10-15 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > The submodule helper update_clone called by "git submodule update", > clones submodules if needed. As submodules used to have the URL indicating > if they were active, the step to resolve relative URLs was done in the > "submodule init" step. Nowadays submodules can be

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Christian Couder
On Mon, Oct 15, 2018 at 8:33 PM Johannes Schindelin wrote: > > Hi team, > > On Mon, 15 Oct 2018, Christian Couder wrote: > > > On Mon, Oct 15, 2018 at 5:46 PM Duy Nguyen wrote: > > > > > > On Mon, Oct 15, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason > > > wrote: > > > > As an aside I poked Junio via

[PATCH] submodule helper: convert relative URL to absolute URL if needed

2018-10-15 Thread Stefan Beller
The submodule helper update_clone called by "git submodule update", clones submodules if needed. As submodules used to have the URL indicating if they were active, the step to resolve relative URLs was done in the "submodule init" step. Nowadays submodules can be configured active without calling

Re: [PATCH v2 10/13] Add a base implementation of SHA-256 support

2018-10-15 Thread brian m. carlson
On Mon, Oct 15, 2018 at 04:59:12PM +0200, Duy Nguyen wrote: > On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson > wrote: > > > > SHA-1 is weak and we need to transition to a new hash function. For > > some time, we have referred to this new function as NewHash. Recently, > > we decided to pick

Re: [PATCH v10 00/21] Convert "git stash" to C builtin

2018-10-15 Thread Thomas Gummerer
On 10/15, Paul-Sebastian Ungureanu wrote: > Hello, > > This is a new iteration of `git stash`, based on the last review. > This iteration fixes some code styling issues, bring some changes > to `do_push_stash()` and `do_create_stash()` to be closer to API by > following Thomas Gummerer's review

Re: [PATCH v10 18/21] stash: convert save to builtin

2018-10-15 Thread Thomas Gummerer
On 10/15, Paul-Sebastian Ungureanu wrote: > The `-m` option is no longer supported as it might not make > sense to have two ways of passing a message. Even if this is > a change in behaviour, the documentation remains the same > because the `-m` parameter was omitted before. [...] > +

Re: [PATCH v10 19/21] stash: convert `stash--helper.c` into `stash.c`

2018-10-15 Thread Thomas Gummerer
On 10/15, Paul-Sebastian Ungureanu wrote: > The old shell script `git-stash.sh` was removed and replaced > entirely by `builtin/stash.c`. In order to do that, `create` and > `push` were adapted to work without `stash.sh`. For example, before > this commit, `git stash create` called `git

Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'

2018-10-15 Thread Christian Hesse
Junio C Hamano on Wed, 2018/10/10 11:26: > As 'contrib' material without real maintenance, I do not care too > deeply, but shouldn't this change be more like this to avoid > duplicating the list of targets? Probably, yes. Do you want to add this yourself or do you want me to send an updated

Re: [PATCH v3] gpg-interface.c: detect and reject multiple signatures on commits

2018-10-15 Thread Michał Górny
On Mon, 2018-10-15 at 12:31 +0900, Junio C Hamano wrote: > Michał Górny writes: > > > GnuPG supports creating signatures consisting of multiple signature > > packets. If such a signature is verified, it outputs all the status > > messages for each signature separately. However, git currently

Re: [PATCH v10 08/21] stash: convert apply to builtin

2018-10-15 Thread Thomas Gummerer
On 10/15, Johannes Schindelin wrote: > Hi Paul, > > On Mon, 15 Oct 2018, Paul-Sebastian Ungureanu wrote: > > > +static void assert_stash_like(struct stash_info *info, const char > > *revision) > > +{ > > + if (get_oidf(>b_commit, "%s^1", revision) || > > + get_oidf(>w_tree, "%s:",

Re: [PATCH v2 09/13] git-p4: use `test_atexit` to kill the daemon

2018-10-15 Thread Luke Diamand
On Mon, 15 Oct 2018 at 16:02, Johannes Schindelin wrote: > > Hi Luke, > > On Mon, 15 Oct 2018, Luke Diamand wrote: > > > On Mon, 15 Oct 2018 at 11:12, Johannes Schindelin via GitGitGadget > > wrote: > > > > > > From: Johannes Schindelin > > > > > > This should be more reliable than the current

Re: Git Test Coverage Report (Monday, Oct 15)

2018-10-15 Thread Derrick Stolee
On 10/15/2018 12:24 PM, Derrick Stolee wrote: Uncovered code in 'jch' (22f2f0f) and not in 'next' (152ad8e) - prio-queue.c 2d181390f3 94) return queue->array[queue->nr - 1].data; (I have a fix to cover this in my private branch for

Re: [PATCH] branch: trivial style fix

2018-10-15 Thread Jeff King
On Sat, Oct 06, 2018 at 08:40:33AM +0800, Tao Qingyun wrote: > >> - for (i = 0; i < argc; i++, strbuf_reset()) { > >> + for (i = 0; i < argc; i++) { > >>char *target = NULL; > >>int flags = 0; > >> > >> + strbuf_reset(); > > > > This is not "trivial" nor

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Johannes Schindelin
Hi team, On Mon, 15 Oct 2018, Christian Couder wrote: > On Mon, Oct 15, 2018 at 5:46 PM Duy Nguyen wrote: > > > > On Mon, Oct 15, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason > > wrote: > > > As an aside I poked Junio via private mail in late August to see if he'd > > > be interested in pushing to

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

2018-10-15 Thread Ben Peart
fixup! IEOT error messages Enable localizing new error messages and improve the error message for invalid IEOT extension sizes. Signed-off-by: Ben Peart --- read-cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/read-cache.c b/read-cache.c index

Re: What's cooking in git.git (Oct 2018, #02; Sat, 13)

2018-10-15 Thread Stefan Beller
On Fri, Oct 12, 2018 at 6:03 PM Junio C Hamano wrote: > > Stefan Beller writes: > > >> * sb/submodule-recursive-fetch-gets-the-tip (2018-10-11) 9 commits > >> . builtin/fetch: check for submodule updates for non branch fetches > >> . fetch: retry fetching submodules if needed objects were not

Re: [PATCH] Typo `dashes ?` -> `dashes?`

2018-10-15 Thread Jeff King
On Sun, Oct 14, 2018 at 07:44:58PM +, Jacques Bodin-Hullin wrote: > diff --git a/parse-options.c b/parse-options.c > index 3b874a83a0c89..88512212392ae 100644 > --- a/parse-options.c > +++ b/parse-options.c > @@ -352,7 +352,7 @@ static void check_typos(const char *arg, const struct > option

Re: [PATCH] builtin/branch.c: remove useless branch_get

2018-10-15 Thread Jeff King
On Mon, Oct 15, 2018 at 10:08:39PM +0800, Tao Qingyun wrote: > Signed-off-by: Tao Qingyun The commit message should describe the "why" here. I gave some reasoning nearby in: https://public-inbox.org/git/20181015171417.ga1...@sigill.intra.peff.net/ >From your initial message, it sounds like

Re: [Question] builtin/branch.c

2018-10-15 Thread Jeff King
On Sun, Oct 14, 2018 at 12:19:35PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Sat, Oct 13, 2018 at 10:12 AM Tao Qingyun wrote: > > Hi, I am learning `builtin/branch.c`. I find that it will call `branch_get` > > before create and [un]set upstream, and die with "no such branch" if failed. > > but

Re:Business proposition for you

2018-10-15 Thread Melvin Greg
Hello, Business proposition for you. I have a client from Syrian who will like to invest with your company. My client is willing to invest $4 Million. Can I have your company website to show to my client your company so that they will check and decide if they will invest there funds with

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

2018-10-15 Thread SZEDER Gábor
On Mon, Sep 17, 2018 at 03:33:35PM +, Ævar Arnfjörð Bjarmason wrote: > @@ -560,6 +563,9 @@ static int add_packed_commits(const struct object_id *oid, > off_t offset = nth_packed_object_offset(pack, pos); > struct object_info oi = OBJECT_INFO_INIT; > > + if (list->progress) >

Re: [PATCH 15/16] commit-reach: make can_all_from_reach... linear

2018-10-15 Thread René Scharfe
Am 15.10.2018 um 17:31 schrieb Derrick Stolee: > On 10/14/2018 10:29 AM, René Scharfe wrote: >> diff --git a/git-compat-util.h b/git-compat-util.h >> index 5f2e90932f..491230fc57 100644 >> --- a/git-compat-util.h >> +++ b/git-compat-util.h >> @@ -1066,6 +1066,21 @@ static inline void

Git Test Coverage Report (Monday, Oct 15)

2018-10-15 Thread Derrick Stolee
In an effort to ensure new code is reasonably covered by the test suite, we now have contrib/coverage-diff.sh to combine the gcov output from 'make coverage-test ; make coverage-report' with the output from 'git diff A B' to discover _new_ lines of code that are not covered. This report

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Christian Couder
On Mon, Oct 15, 2018 at 5:46 PM Duy Nguyen wrote: > > On Mon, Oct 15, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason > wrote: > > As an aside I poked Junio via private mail in late August to see if he'd > > be interested in pushing to gitlab.com/git/git.git too as part of his > > normal push-outs.

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

2018-10-15 Thread SZEDER Gábor
On Thu, Oct 11, 2018 at 07:52:21PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Oct 10 2018, Ævar Arnfjörð Bjarmason wrote: > > > On Wed, Oct 10 2018, SZEDER Gábor wrote: > > > >> On Wed, Oct 10, 2018 at 11:56:45PM +0200, Ævar Arnfjörð Bjarmason wrote: > >>> On Wed, Oct 10 2018, SZEDER

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason wrote: > As an aside I poked Junio via private mail in late August to see if he'd > be interested in pushing to gitlab.com/git/git.git too as part of his > normal push-outs. One neat thing that would buy us is the ability to > have a

Re: [PATCH 15/16] commit-reach: make can_all_from_reach... linear

2018-10-15 Thread Derrick Stolee
On 10/14/2018 10:29 AM, René Scharfe wrote: It still has some repetition, converted code is a bit longer than the current one, and I don't know how to build a Coccinelle rule that would do that conversion. Looked for a possibility to at least leave QSORT call-sites alone by enhancing that

Re: [BUG] gitignore documentation inconsistent with actual behaviour

2018-10-15 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 12:57 AM Junio C Hamano wrote: > > Duy Nguyen writes: > > >> Our matching function comes from rsync originally, whose manpage says: > >> > >> use ’**’ to match anything, including slashes. > >> > >> I believe this is accurate as far as the implementation goes. > > > >

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

2018-10-15 Thread Derrick Stolee
On 10/14/2018 10:19 PM, brian m. carlson wrote: Since the commit-graph code wants to serialize the hash algorithm into the data store, specify a version number for each supported algorithm. Note that we don't use the values of the constants themselves, as they are internal and could change in

Re: [PATCH v2 09/13] commit-graph: convert to using the_hash_algo

2018-10-15 Thread Derrick Stolee
On 10/14/2018 10:18 PM, brian m. carlson wrote: Instead of using hard-coded constants for object sizes, use the_hash_algo to look them up. In addition, use a function call to look up the object ID version and produce the correct value. This looks good and I can see already how this new

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-15 Thread Ævar Arnfjörð Bjarmason
On Mon, Sep 03 2018, Johannes Schindelin via GitGitGadget wrote: > As a special treat, this patch series adds the ability to present the > outcome of Git's test suite as JUnit-style .xml files. This allows the VSTS > build to present fun diagrams, trends, and makes it a lot easier to drill >

Re: [PATCH v2 09/13] git-p4: use `test_atexit` to kill the daemon

2018-10-15 Thread Johannes Schindelin
Hi Luke, On Mon, 15 Oct 2018, Luke Diamand wrote: > On Mon, 15 Oct 2018 at 11:12, Johannes Schindelin via GitGitGadget > wrote: > > > > From: Johannes Schindelin > > > > This should be more reliable than the current method, and prepares the > > test suite for a consistent way to clean up

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

2018-10-15 Thread Elijah Newren
On Sun, Oct 14, 2018 at 10:12 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > When using merge.conflictstyle=diff3 to have the "base version" be shown > > in conflicts, there is the possibility that the base version itself has > > conflicts in it. This comes about when there are more

Re: [PATCH v2 10/13] Add a base implementation of SHA-256 support

2018-10-15 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson wrote: > > SHA-1 is weak and we need to transition to a new hash function. For > some time, we have referred to this new function as NewHash. Recently, > we decided to pick SHA-256 as NewHash. > > Add a basic implementation of SHA-256 based off

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-15 Thread Johannes Schindelin
Hi Taylor, On Mon, 15 Oct 2018, Taylor Blau wrote: > Thanks for putting this together, and offering to build Git on Azure > Pipelines. I haven't followed v1 of this series very closely, so please > excuse me if my comments have already been addressed, and I missed them > in a skim of the last

Re: [PATCH 3/3] mingw: use domain information for default email

2018-10-15 Thread Eric Sunshine
On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget wrote: > When a user is registered in a Windows domain, it is really easy to > obtain the email address. So let's do that. > [...] > Signed-off-by: Johannes Schindelin > --- > diff --git a/compat/mingw.c b/compat/mingw.c > @@

Re: [PATCH 0/4] Bloom filter experiment

2018-10-15 Thread Derrick Stolee
On 10/9/2018 3:34 PM, SZEDER Gábor wrote: To keep the ball rolling, here is my proof of concept in a somewhat cleaned-up form, with still plenty of rough edges. Peff, Szeder, and Jonathan, Thanks for giving me the kick in the pants to finally write a proof of concept for my personal take on

Re: [PATCH 2/3] getpwuid(mingw): provide a better default for the user name

2018-10-15 Thread Eric Sunshine
On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget wrote: > We do have the excellent GetUserInfoEx() function to obtain more > detailed information of the current user (if the user is part of a > Windows domain); Let's use it. > [...] > Signed-off-by: Johannes Schindelin > ---

Re: [PATCH 1/3] getpwuid(mingw): initialize the structure only once

2018-10-15 Thread Eric Sunshine
On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget wrote: > Signed-off-by: Johannes Schindelin > --- > diff --git a/compat/mingw.c b/compat/mingw.c > @@ -1800,16 +1800,27 @@ int mingw_getpagesize(void) > struct passwd *getpwuid(int uid) > { > + static unsigned

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-15 Thread Taylor Blau
Hi Johannes, Thanks for putting this together, and offering to build Git on Azure Pipelines. I haven't followed v1 of this series very closely, so please excuse me if my comments have already been addressed, and I missed them in a skim of the last revision. On Mon, Oct 15, 2018 at 03:11:57AM

[PATCH] builtin/branch.c: remove useless branch_get

2018-10-15 Thread Tao Qingyun
Signed-off-by: Tao Qingyun --- builtin/branch.c | 5 - 1 file changed, 5 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index c396c41533..2367703034 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -809,11 +809,6 @@ int cmd_branch(int argc, const char **argv, const

Re: [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

2018-10-15 Thread Eric Sunshine
On Mon, Oct 15, 2018 at 6:14 AM Brendan Forster via GitGitGadget wrote: > This config value is only used if http.sslBackend is set to "schannel", > which forces cURL to use the Windows Certificate Store when validating > server certificates associated with a remote server. > > This is only

Re: [PATCH 1/3] http: add support for selecting SSL backends at runtime

2018-10-15 Thread Eric Sunshine
On Mon, Oct 15, 2018 at 6:14 AM Johannes Schindelin via GitGitGadget wrote: > This patch adds the Git side of that feature: by setting http.sslBackend > to "openssl" or "schannel", Git for Windows can now choose the SSL > backend at runtime. > [...] > Signed-off-by: Johannes Schindelin > --- >

Re: Git Test Coverage Report (Friday, Oct 12)

2018-10-15 Thread Derrick Stolee
On 10/15/2018 4:09 AM, Johannes Schindelin wrote: Hi Stolee, On Fri, 12 Oct 2018, Derrick Stolee wrote: In an effort to ensure new code is reasonably covered by the test suite, we now have contrib/coverage-diff.sh to combine the gcov output from 'make coverage-test ; make coverage-report'

Ignored files being silently overwritten when switching branches

2018-10-15 Thread Per Lundberg
Hi, Sorry if this question has been asked before; I skimmed through the list archives and the FAQ but couldn't immediately find it - please point me in the right direction if it has indeed been discussed before. We were renaming some previously-included configuration files (foo.conf) in one

Case when I can not unstage the hunk

2018-10-15 Thread KES
Hi. Here is log: git reset HEAD -p /home/kes/s/public/v2/js/contact_us.js diff --git a/public/v2/js/contact_us.js b/public/v2/js/contact_us.js index e05be6d0..d429d291 100644 --- a/public/v2/js/contact_us.js +++ b/public/v2/js/contact_us.js @@ -1,7 +1,19 @@ + + +function captchaProcess( form ) {

stat displayed differently

2018-10-15 Thread KES
Hi. At next log: $ git prb POST git-upload-pack (948 bytes) remote: Counting objects: 20, done. remote: Compressing objects: 100% (19/19), done. remote: Total 20 (delta 14), reused 0 (delta 0) Unpacking objects: 100% (20/20), done. >From https://tracker.feel-safe.net/gitdev/main

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

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

[PATCHv2 0/3] git-p4: improved unshelving - small fixes

2018-10-15 Thread Luke Diamand
This is the same as my earlier patch other than fixing the documentation to reflect the change to the destination branch, as noticed by Junio. Luke Diamand (3): git-p4: do not fail in verbose mode for missing 'fileSize' key git-p4: unshelve into refs/remotes/p4-unshelved, not

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

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

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

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

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

2018-10-15 Thread Luke Diamand
On Fri, 12 Oct 2018 at 19:19, Luke Diamand wrote: > > On Fri, 12 Oct 2018 at 14:45, Junio C Hamano wrote: > > > > Luke Diamand writes: > > > > > The branch detection code looks for branches under refs/remotes/p4/... > > > and can end up getting confused if there are unshelved changes in > > >

Re: [PATCH v2 09/13] git-p4: use `test_atexit` to kill the daemon

2018-10-15 Thread Luke Diamand
On Mon, 15 Oct 2018 at 11:12, Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > This should be more reliable than the current method, and prepares the > test suite for a consistent way to clean up before re-running the tests > with different options. > I'm finding

Loan Offer

2018-10-15 Thread rifat
Do you need a loan? If YES Kindly contact us via: citigrouploaninvestm...@aol.com

[PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

2018-10-15 Thread Brendan Forster via GitGitGadget
From: Brendan Forster This adds support for a new http.schannelCheckRevoke config value. This config value is only used if http.sslBackend is set to "schannel", which forces cURL to use the Windows Certificate Store when validating server certificates associated with a remote server. This

[PATCH 3/3] http: when using Secure Channel, ignore sslCAInfo by default

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, let's tell Git to not ask cURL to use that bundle by default when

[PATCH 1/3] http: add support for selecting SSL backends at runtime

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin As of version 7.56.0, curl supports being compiled with multiple SSL backends. This patch adds the Git side of that feature: by setting http.sslBackend to "openssl" or "schannel", Git for Windows can now choose the SSL backend at runtime. This comes in handy on

[PATCH 0/3] Allow choosing the SSL backend cURL uses (plus related patches)

2018-10-15 Thread Johannes Schindelin via GitGitGadget
This topic branch brings support for choosing cURL's SSL backend (a feature developed in Git for Windows' context) at runtime via http.sslBackend, and two more patches that are related (and only of interest for Windows users). Brendan Forster (1): http: add support for disabling SSL revocation

[PATCH v2 11/13] tests: record more stderr with --write-junit-xml in case of failure

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Sometimes, failures in a test case are actually caused by issues in earlier test cases. To make it easier to see those issues, let's attach the output from before the failing test case (i.e. stdout/stderr since the previous failing test case, or the start of the test

[PATCH v2 12/13] README: add a build badge (status of the Azure Pipelines build)

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Just like so many other OSS projects, we now also have a build badge. Signed-off-by: Johannes Schindelin --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f920a42fad..bf4780c22d 100644 --- a/README.md +++ b/README.md @@

[PATCH v2 03/13] test-date: add a subcommand to measure times in shell scripts

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In the next commit, we want to teach Git's test suite to optionally output test results in JUnit-style .xml files. These files contain information about the time spent. So we need a way to measure time. While we could use `date +%s` for that, this will give us only

[PATCH v2 10/13] tests: include detailed trace logs with --write-junit-xml upon failure

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The JUnit XML format lends itself to be presented in a powerful UI, where you can drill down to the information you are interested in very quickly. For test failures, this usually means that you want to see the detailed trace of the failing tests. With Travis CI, we

[PATCH v2 13/13] travis: fix skipping tagged releases

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When building a PR, TRAVIS_BRANCH refers to the *target branch*. Therefore, if a PR targets `master`, and `master` happened to be tagged, we skipped the build by mistake. Fix this by using TRAVIS_PULL_REQUEST_BRANCH (i.e. the *source branch*) when available, falling

[PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-15 Thread Johannes Schindelin via GitGitGadget
For a long time already, we have Git's source code continuously tested via Travis CI, see e.g. https://travis-ci.org/git/git/builds/421738884. It has served us well, and more and more developers actually pay attention and benefit from the testing this gives us. It is also an invaluable tool for

[PATCH v2 07/13] tests: introduce `test_atexit`

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When running the p4 daemon or `git daemon`, we want to kill it at the end of the test script. So far, we do this "manually". However, in the next few commits we want to teach the test suite to optionally re-run scripts with different options, therefore we will have to

[PATCH v2 06/13] Add a build definition for Azure DevOps

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This commit adds an azure-pipelines.yml file which is Azure DevOps' equivalent to Travis CI's .travis.yml. To make things a bit easier to understand, we refrain from using the `matrix` feature here because (while it is powerful) it can be a bit confusing to users who

[PATCH v2 05/13] ci/lib.sh: add support for Azure Pipelines

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This patch introduces a conditional arm that defines some environment variables and a function that displays the URL given the job id (to identify previous runs for known-good trees). Signed-off-by: Johannes Schindelin --- ci/lib.sh | 23 +++ 1

[PATCH v2 09/13] git-p4: use `test_atexit` to kill the daemon

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This should be more reliable than the current method, and prepares the test suite for a consistent way to clean up before re-running the tests with different options. Signed-off-by: Johannes Schindelin --- t/lib-git-p4.sh| 10 +-

[PATCH v2 04/13] tests: optionally write results as JUnit-style .xml

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This will come in handy when publishing the results of Git's test suite during an automated Azure DevOps run. Signed-off-by: Johannes Schindelin --- t/.gitignore | 1 + t/test-lib.sh | 98 +++ 2 files changed, 99

[PATCH v2 01/13] ci: rename the library of common functions

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The name is hard-coded to reflect that we use Travis CI for continuous testing. In the next commits, we will extend this to be able use Azure DevOps, too. So let's adjust the name to make it more generic. Signed-off-by: Johannes Schindelin ---

[PATCH v2 08/13] git-daemon: use `test_atexit` in the tests

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This makes use of the just-introduced consistent way to specify that a long-running process needs to be terminated at the end of a test script run. Signed-off-by: Johannes Schindelin --- t/interop/i5500-git-daemon.sh | 1 - t/lib-git-daemon.sh | 3 +--

[PATCH v2 02/13] ci/lib.sh: encapsulate Travis-specific things

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The upcoming patches will allow building git.git via Azure Pipelines (i.e. Azure DevOps' Continuous Integration), where variable names and URLs look a bit different than in Travis CI. Signed-off-by: Johannes Schindelin --- ci/install-dependencies.sh | 3 ++-

[PATCH 3/3] mingw: use domain information for default email

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When a user is registered in a Windows domain, it is really easy to obtain the email address. So let's do that. Suggested by Lutz Roeder. Signed-off-by: Johannes Schindelin --- compat/mingw.c| 5 + compat/mingw.h| 2 ++ git-compat-util.h | 4

[PATCH 2/3] getpwuid(mingw): provide a better default for the user name

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We do have the excellent GetUserInfoEx() function to obtain more detailed information of the current user (if the user is part of a Windows domain); Let's use it. Suggested by Lutz Roeder. To avoid the cost of loading Secur32.dll (even lazily, loading DLLs takes a

[PATCH 0/3] Provide a useful default user ident on Windows

2018-10-15 Thread Johannes Schindelin via GitGitGadget
On Linux, we use the gecos information to come up with a sensible user name/email. On Windows, there is no gecos. But there is something comparable, and with these patches, we use it. This has been carried in Git for Windows for three years, and is considered mature. Johannes Schindelin (3):

[PATCH 1/3] getpwuid(mingw): initialize the structure only once

2018-10-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- compat/mingw.c | 25 ++--- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index 18caf21969..597781b370 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@

Re: [PATCH v10 08/21] stash: convert apply to builtin

2018-10-15 Thread Johannes Schindelin
Hi Paul, On Mon, 15 Oct 2018, Paul-Sebastian Ungureanu wrote: > +static void assert_stash_like(struct stash_info *info, const char *revision) > +{ > + if (get_oidf(>b_commit, "%s^1", revision) || > + get_oidf(>w_tree, "%s:", revision) || > + get_oidf(>b_tree, "%s^1:",

  1   2   >