[L10N] Kickoff for Git 2.22.0 round #2

2019-05-30 Thread Jiang Xin
Hi, Git v2.22.0-rc2 introduced 6 update messages, and let's start new round of git l10n based on the following commit: l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed) Generate po/git.pot from v2.22.0-rc2 for git v2.22.0 l10n round 2. Signed-off-by: Jiang Xin You can get

Re: "Losing" MERGE_HEAD

2019-05-30 Thread Elijah Newren
On Thu, May 30, 2019 at 9:19 PM Bryan Turner wrote: > > I was looking through the commit history in a repository I work in and > I found a place where someone had created a merge, but somewhere > between "git merge" and "git commit" the fact that it was a merge was > "lost". Instead they ended up

Re: [PATCH v5 04/16] promisor-remote: implement promisor_remote_get_direct()

2019-05-30 Thread Christian Couder
Hi Stolee, On Thu, May 30, 2019 at 7:21 PM Derrick Stolee wrote: > > On 4/9/2019 12:11 PM, Christian Couder wrote: > > From: Christian Couder > > > > This is implemented for now by calling fetch_objects(). It fetches > > from all the promisor remotes. > > Sorry for jumping on the thread late, bu

"Losing" MERGE_HEAD

2019-05-30 Thread Bryan Turner
I was looking through the commit history in a repository I work in and I found a place where someone had created a merge, but somewhere between "git merge" and "git commit" the fact that it was a merge was "lost". Instead they ended up with a really big commit that applied all the changes from the

[RFC PATCH] config: learn the "onbranch:" includeIf condition

2019-05-30 Thread Denton Liu
Currently, if a user wishes to have individual settings per branch, they are required to manually keep track of the settings in their head and manually set the options on the command-line or change the config at each branch. Teach config the "onbranch:" includeIf condition so that it can condition

Re: [PATCH v3 0/8] teach branch-specific options for format-patch

2019-05-30 Thread Denton Liu
On Tue, May 21, 2019 at 10:44:23PM -0400, Denton Liu wrote: > Hi Junio, > > I've gotten rid of all the `format.*.coverSubject` stuff and replaced it > with a generic `format.inferCoverSubject` that will read the subject > from the branch description. I've also made `git branch -d` stop > deleting

What's cooking in git.git (May 2019, #05; Thu, 30)

2019-05-30 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The second round of release candid

[ANNOUNCE] Git v2.22.0-rc2

2019-05-30 Thread Junio C Hamano
A release candidate Git v2.22.0-rc2 is now available for testing at the usual places. It is comprised of 714 non-merge commits since v2.21.0, contributed by 67 people, 17 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following pu

Re: [PATCH v5 04/16] promisor-remote: implement promisor_remote_get_direct()

2019-05-30 Thread Derrick Stolee
On 5/30/2019 4:46 PM, Johannes Schindelin wrote: > Hi, > > On Thu, 30 May 2019, Derrick Stolee wrote: > >> On 4/9/2019 12:11 PM, Christian Couder wrote: >>> From: Christian Couder >>> >>> +{ >>> + int i, missing_nr = 0; >>> + int *missing = xcalloc(oid_nr, sizeof(*missing)); >>> + struct o

Re: [PATCH v5 04/16] promisor-remote: implement promisor_remote_get_direct()

2019-05-30 Thread Johannes Schindelin
Hi, On Thu, 30 May 2019, Derrick Stolee wrote: > On 4/9/2019 12:11 PM, Christian Couder wrote: > > From: Christian Couder > > > > +{ > > + int i, missing_nr = 0; > > + int *missing = xcalloc(oid_nr, sizeof(*missing)); > > + struct object_id *old_oids = *oids; > > + struct object_id *new_

Re: [PATCH] userdiff: two simplifications of patterns for rust

2019-05-30 Thread Johannes Sixt
Am 30.05.19 um 20:59 schrieb Ævar Arnfjörð Bjarmason: > > On Thu, May 30 2019, Johannes Sixt wrote: > >> - Do not enforce (but assume) syntactic correctness of language >> constructs that go into hunk headers: we only want to ensure that >> the keywords actually are words and not just the ini

Re: Request: git add --interactive: split hunk: When can't split further, split on empty lines

2019-05-30 Thread Philip Oakley
Thanks for the clarification. Funny that we are "staging" the patch preparation to avoid real staging;-) On 30/05/2019 20:43, Johannes Schindelin wrote: Hi Philip, On Thu, 30 May 2019, Philip Oakley wrote: On 30/05/2019 15:53, Johannes Schindelin wrote: Having said that, there was a patch s

Re: Request: git add --interactive: split hunk: When can't split further, split on empty lines

2019-05-30 Thread Johannes Schindelin
Hi Philip, On Thu, 30 May 2019, Philip Oakley wrote: > On 30/05/2019 15:53, Johannes Schindelin wrote: > > > > Having said that, there was a patch series recently to add the ability to > > stage individual lines, > > I believe that the git-gui (in tk/tcl, but using git commands) was > already abl

Travis not looking so good

2019-05-30 Thread Johannes Schindelin
Hi Gábor, do you have any idea why Travis is failing like this in the macOS/gcc job? > +case "$jobname" in > +brew link gcc@8 > Error: No such keg: /usr/local/Cellar/gcc@8 > The command "ci/install-dependencies.sh" failed and exited with 1 during . I usually only look at the Azure Pipelines (whi

Re: Request: git add --interactive: split hunk: When can't split further, split on empty lines

2019-05-30 Thread Philip Oakley
Hi,  some minor comments. On 30/05/2019 15:53, Johannes Schindelin wrote: Hi James, On Wed, 29 May 2019, James Harvey wrote: When adding interactively, 's' can be used to split the current hunk. Once it gets down to where 's' reports "Sorry, cannot split this hunk", it could be useful if it wo

Re: [PATCH] list-objects-filter: merge filter data structs

2019-05-30 Thread Matthew DeVore
On Wed, May 29, 2019 at 04:57:23PM -0400, Jeff Hostetler wrote: > I'd also suggest keeping the "oidset omits" inside each of the > sub-structures, but that's just me. I just reminded myself that the omits need to be outside of the specialized sub-structures because the combine filter logic needs t

Re: [PATCH] userdiff: two simplifications of patterns for rust

2019-05-30 Thread Ævar Arnfjörð Bjarmason
On Thu, May 30 2019, Johannes Sixt wrote: > - Do not enforce (but assume) syntactic correctness of language > constructs that go into hunk headers: we only want to ensure that > the keywords actually are words and not just the initial part of > some identifier. > > - In the word regex, mat

[PATCH v2] send-email: update documentation of required Perl modules

2019-05-30 Thread Chris Mayo
Improve and complete the list of required email related Perl modules, clarifying which are core Perl modules and remove Net::SMTP::SSL. git-send-email uses the TLS support in the Net::SMTP core module from recent versions of Perl. Documenting the minimum version is complex because of separate numb

Re: [RFC PATCH v2] list-objects-filter: merge filter data structs

2019-05-30 Thread Matthew DeVore
On Thu, May 30, 2019 at 09:12:06AM -0700, Junio C Hamano wrote: > > + union { > > + struct { > > Name this, and the ohter two union members, and the union itself as > one member inside the outer struct; some compilers would be unhappy > with the GCC extension that allows you to refer t

Re: What's cooking in git.git (May 2019, #04; Tue, 28)

2019-05-30 Thread Derrick Stolee
On 5/30/2019 11:01 AM, Johannes Schindelin wrote: > Hi Peff, > > On Thu, 30 May 2019, Jeff King wrote: > >> On Wed, May 29, 2019 at 09:53:44AM -0700, Junio C Hamano wrote: >> > * ds/object-info-for-prefetch-fix (2019-05-28) 1 commit > - sha1-file: split OBJECT_INFO_FOR_PREFETCH > >>>

Re: Git Test Coverage Report (Thursday, May 30th)

2019-05-30 Thread Derrick Stolee
I decided to take a stab at a full review of the test coverage report in order to try and understand all of the uncovered code. The snippets I highlight below include uncovered code that is not immediately obvious as an acceptable block to leave uncovered. (Some snippets required looking around at

possible submodule bug?

2019-05-30 Thread Alex Levy
Hi. I'm running git version 2.13.2.windows.1. My coworker has the same behavior with 2.21.0.windows.1. I recently set up a git submodule by doing "git submodule add https://github.com/VoltServer/example";. Based on our teams preference, I then tried to update .gitmodules to use the alternate

USB Drives - custom printed with your logo

2019-05-30 Thread Stacy
Hi, I wanted to follow up from last week. Did you receive the email I sent you? Our company manufactures USB Flash Drives, printed with your logo. They make the perfect marketing tool for your business or organization. We offer low minimum quantities, and all memory sizes. Over 150 Stock Model

Re: [PATCH v5 04/16] promisor-remote: implement promisor_remote_get_direct()

2019-05-30 Thread Derrick Stolee
On 4/9/2019 12:11 PM, Christian Couder wrote: > From: Christian Couder > > This is implemented for now by calling fetch_objects(). It fetches > from all the promisor remotes. Hi Christian, Sorry for jumping on the thread late, but I noticed some peculiarities when looking at the test coverage r

[PATCH] userdiff: two simplifications of patterns for rust

2019-05-30 Thread Johannes Sixt
- Do not enforce (but assume) syntactic correctness of language constructs that go into hunk headers: we only want to ensure that the keywords actually are words and not just the initial part of some identifier. - In the word regex, match numbers only when they begin with a digit, but then

Re: [RFC PATCH v2] list-objects-filter: merge filter data structs

2019-05-30 Thread Junio C Hamano
Matthew DeVore writes: > +struct filter_data { > + /* Used by all filter types. */ > struct oidset *omits; > + > + enum list_objects_filter_result (*filter_object_fn)( > + struct repository *r, > + enum list_objects_filter_situation filter_situation, > +

Re: What's cooking in git.git (May 2019, #04; Tue, 28)

2019-05-30 Thread Johannes Schindelin
Hi Peff, On Thu, 30 May 2019, Jeff King wrote: > On Wed, May 29, 2019 at 09:53:44AM -0700, Junio C Hamano wrote: > > > >> * ds/object-info-for-prefetch-fix (2019-05-28) 1 commit > > >> - sha1-file: split OBJECT_INFO_FOR_PREFETCH > > >> > > >> Code cleanup. > > >> > > >> Will merge to 'next'. >

Re: [PATCH 00/52] fix some -Wmissing-field-initializer warnings

2019-05-30 Thread Ramsay Jones
On 30/05/2019 13:04, Jeff King wrote: > On Thu, May 30, 2019 at 10:47:37AM +0200, Johannes Sixt wrote: > >> I had a brief look at the series. IMO, it is a mistake to appease >> -Wmissing-field-initializer. >> >> We have two sorts of initializers: >> >> - zero initializers: they just want to nu

Re: Request: git add --interactive: split hunk: When can't split further, split on empty lines

2019-05-30 Thread Johannes Schindelin
Hi James, On Wed, 29 May 2019, James Harvey wrote: > When adding interactively, 's' can be used to split the current hunk. > Once it gets down to where 's' reports "Sorry, cannot split this > hunk", it could be useful if it would then start splitting based on > empty lines, probably leaving empty

Re: [PATCH v1 3/5] list-objects-filter: implement composite filters

2019-05-30 Thread Jeff Hostetler
On 5/29/2019 7:27 PM, Matthew DeVore wrote: On Wed, May 29, 2019 at 05:29:14PM -0400, Jeff Hostetler wrote: Was sparse:path filter the only reason for needing all the URL encoding? The sparse:oid form allows values : and these (or at least the portion) may contain special characters. So don

Git Test Coverage Report (Thursday, May 30th)

2019-05-30 Thread Derrick Stolee
Here is today's test coverage report. You can view it in HTML [1] or download the plain-text version [2], also pasted below. Thanks, -Stolee [1] https://derrickstolee.github.io/git-test-coverage/reports/2019-05-30.htm [2] https://derrickstolee.github.io/git-test-coverage/reports/2019-05-30.txt -

FW: AW: Kontakt.

2019-05-30 Thread info
Sehr geehrte Damen und Herren, ich wende mich an Sie, da ich der Meinung bin, dass sich die von Ihnen auf der Webseite angebotenen Produkte ausgezeichnet dazu eignen, im Internet gefördert zu werden. Deshalb möchte ich Ihnen die Tools anbieten, die es erlauben, den Verkauf von Ihren Produkten u

Re: [PATCH 00/52] fix some -Wmissing-field-initializer warnings

2019-05-30 Thread Jeff King
On Thu, May 30, 2019 at 10:47:37AM +0200, Johannes Sixt wrote: > I had a brief look at the series. IMO, it is a mistake to appease > -Wmissing-field-initializer. > > We have two sorts of initializers: > > - zero initializers: they just want to null out every field, >like CHILD_PROCESS_INIT

Re: GIT issue while cloning (fatal: pack is corrupted (SHA1 mismatch)) !!!

2019-05-30 Thread Jeff King
On Wed, May 29, 2019 at 09:06:18AM +, Vanak, Ibrahim wrote: > After cloning when I tried to checkout a branch on HPUX and Linux, I > still significant time difference there as well even though network is > not involve here. Do you suspect anything with HPUX OS? Do you have > any mechanism to f

Re: git archive generates tar with malformed pax extended attribute

2019-05-30 Thread Jeff King
On Wed, May 29, 2019 at 07:54:44PM +0200, René Scharfe wrote: > Am 29.05.19 um 03:17 schrieb Jeff King: > > On Wed, May 29, 2019 at 01:34:32AM +0200, René Scharfe wrote: > >> Parsing trees with symlinks twice is not ideal, but keeps the set > >> structure simple -- a standard oidset suffices. > >

Re: What's cooking in git.git (May 2019, #04; Tue, 28)

2019-05-30 Thread Jeff King
On Wed, May 29, 2019 at 09:53:44AM -0700, Junio C Hamano wrote: > >> * ds/object-info-for-prefetch-fix (2019-05-28) 1 commit > >> - sha1-file: split OBJECT_INFO_FOR_PREFETCH > >> > >> Code cleanup. > >> > >> Will merge to 'next'. > > > > I think this one is actually a bug-fix (we are refusing

Re: [PATCH 00/52] fix some -Wmissing-field-initializer warnings

2019-05-30 Thread Johannes Sixt
Hi Ramsay, I had a brief look at the series. IMO, it is a mistake to appease -Wmissing-field-initializer. We have two sorts of initializers: - zero initializers: they just want to null out every field, like CHILD_PROCESS_INIT and ad-hoc initializers of structs such as xpparam_t pp = { 0 }