Re: [PATCH 2/2 v3] doc: format pathnames and URLs as monospace.

2019-03-12 Thread Eric Sunshine
On Tue, Mar 12, 2019 at 10:17 PM Junio C Hamano wrote: > Andrei Rybak writes: > > On 2019-03-12 16:48, Eric Sunshine wrote: > >> * drop the full stop from the first line of the commit message > >> * s/futur/future/ in the commit message > >> * s/There are false/& positives/ in the commit message

[no subject]

2019-03-12 Thread Major Dennis Hornbeck
I am in the military unit here in Afghanistan, we have some amount of funds that we want to move out of the country. My partners and I need a good partner someone we can trust. It is risk free and legal. Reply to this email: hornbeckmajordennis...@gmail.com Regards, Major Dennis Hornbeck.

lening aanvragen

2019-03-12 Thread Simple Federal Credit Union
-- Goedendag,    Het is ons een genoegen u te schrijven met betrekking tot het verstrekken van leningen per postadvertentie. Simple Federal Credit Union, We opereren onder een korte, duidelijke en begrijpelijke algemene voorwaarden. We verstrekken leningen tegen een lage rente van 3%.

Re: [PATCH v1 11/11] doc: promote "git restore"

2019-03-12 Thread Junio C Hamano
Duy Nguyen writes: >> Just curious: At what point did git checkout become not commonly >> used? Git switch and git restore are not yet in git as of 2.21.0, >> which is rather current. Maybe I missed a thread. > > I declare "git checkout" not commonly used the moment git-switch and > git-restore a

Re: [PATCH v3 02/11] Add initial support for many promisor remotes

2019-03-12 Thread Junio C Hamano
Junio C Hamano writes: > What is the rule for these promisor names? Disregard this part (and only this part). The values are not names, but just "is this thing a promisor" boolean.

Re: [PATCH v3 05/11] promisor-remote: use repository_format_partial_clone

2019-03-12 Thread Junio C Hamano
Christian Couder writes: > A remote specified using the extensions.partialClone config > option should be considered a promisor remote too. > > This remote should be at the end of the promisor remote list, > so that it is used only if objects have not been found in other > remotes. That's a decl

Re: [PATCH v3 04/11] promisor-remote: add promisor_remote_reinit()

2019-03-12 Thread Junio C Hamano
Christian Couder writes: > From: Christian Couder > > We will need to reinitialize the promisor remote configuration > as we will make some changes to it in a later commit. > > Signed-off-by: Christian Couder > --- At this point, turning "initialized" into a file-scope static, and building re

Re: [PATCH v3 03/11] promisor-remote: implement promisor_remote_get_direct()

2019-03-12 Thread Junio C Hamano
Christian Couder writes: > @@ -98,3 +99,19 @@ int has_promisor_remote(void) > { > return !!promisor_remote_find(NULL); > } > + > +int promisor_remote_get_direct(const struct object_id *oids, int oid_nr) > +{ > + struct promisor_remote *o; > + > + promisor_remote_init(); > + > +

Re: [PATCH v3 02/11] Add initial support for many promisor remotes

2019-03-12 Thread Junio C Hamano
Christian Couder writes: > +struct promisor_remote *promisor_remote_new(const char *remote_name) > +{ Shouldn't this be static? The config callback that calls this function is inside this file. > + struct promisor_remote *o; > + > + o = xcalloc(1, sizeof(*o)); > + o->remote_name =

Re: [RFC PATCH v3 1/5] clone: test for our behavior on odd objects/* content

2019-03-12 Thread Matheus Tavares
Hi, Ævar First of all, I must apologize for my very late reply. I just got back from a trip and only now have been able to look again at this series. On Fri, Mar 1, 2019 at 10:49 AM Ævar Arnfjörð Bjarmason wrote: > > > On Thu, Feb 28 2019, Matheus Tavares Bernardino wrote: > > > Hi, Ævar >

Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-12 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> -Nevertheless, you can use [submitGit](http://submitgit.herokuapp.com/) to >> +Nevertheless, you can use [Git Git Gadget](https://gitgitgadget.github.io/) >> to > > The pointed-at page calls the tool a single word with three capital > Gs without S

Re: [PATCH 2/2 v3] doc: format pathnames and URLs as monospace.

2019-03-12 Thread Junio C Hamano
Andrei Rybak writes: > On 2019-03-12 16:48, Eric Sunshine wrote: >> Thanks. A few comments: >> >> In patch 1/2: >> >> * drop the full stop from the first line of the commit message >> >> * s/futur/future/ in the commit message >> >> * s/There are false/& positives/ in the commit message >> >> * s

Re: [PATCH] t4150: remove unused variable

2019-03-12 Thread Junio C Hamano
Andrei Rybak writes: > In commit 735285b403 ("am: fix signoff when other trailers are present", > 2017-08-08) tests using variable $signoff were rewritten and it is no > longer used, so just remove it from the test setup. > > Signed-off-by: Andrei Rybak > --- > t/t4150-am.sh | 4 +--- > 1 file

Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-12 Thread Junio C Hamano
Jeff King writes: > -Nevertheless, you can use [submitGit](http://submitgit.herokuapp.com/) to > +Nevertheless, you can use [Git Git Gadget](https://gitgitgadget.github.io/) > to The pointed-at page calls the tool a single word with three capital Gs without SP in it. We should match it here an

Re: [PATCH] submodule: explain first attempt failure clearly

2019-03-12 Thread Junio C Hamano
Jonathan Tan writes: > When cloning with --recurse-submodules a superproject with at least one > submodule with HEAD pointing to an unborn branch, the clone goes > something like this: > > Cloning into 'test'... > > Submodule '' () registered for path '' > Cloning into ''

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Junio C Hamano
Eric Sunshine writes: >> Do you use checkout -B only when checkout -b fails, or do you use it >> pre-emptively? The former would suggest we should use a name like >> --recreate, while the latter would suggest a name more like >> --force-create. > > It doesn't come up often, but I use "git checko

Re: [PATCH] repack: enable bitmaps by default on bare repos

2019-03-12 Thread Eric Wong
Jeff King wrote: > OK. I still think of bitmaps as something that might need manual care > and feeding, but I think that may be leftover superstition. I can't > offhand think of any real downsides to this. It's a _relatively_ new feature to long-time users like us, so maybe the "new == immature"

Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-12 Thread Junio C Hamano
Jeff King writes: > infrequent contributors. And there are a few reasons to prefer GGG: > > 1. submitGit seems to still have a few rough edges. E.g., it doesn't > munge timestamps to help threaded mail readers handled out-of-order > delivery. Hmph, I had an impression that the recent

Re: [PATCH v2] stash: pass pathspec as pointer

2019-03-12 Thread Junio C Hamano
Thomas Gummerer writes: >> I see that you added the `const` keyword. While it does not hurt, I would >> probably not have bothered... > > That's fair, I went with what seemed most common in the codebase. > More than half the parameters seem to be using "const struct > pathspec", so that seems to

Re: BUG: Race condition due to reflog expiry in "gc"

2019-03-12 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > I'm still working on fixing a race condition I encountered in "gc" > recently, but am not 100% sure of the fix. So I thought I'd send a > braindump of what I have so far in case it jolts any memories. > > The problem is that when we "gc" we run "reflog expire --a

Re: [PATCH v2] glossary: add definition for overlay

2019-03-12 Thread Junio C Hamano
Thomas Gummerer writes: > diff --git a/Documentation/glossary-content.txt > b/Documentation/glossary-content.txt > index 023ca95e7c..53df6ecb0a 100644 > --- a/Documentation/glossary-content.txt > +++ b/Documentation/glossary-content.txt > @@ -287,6 +287,13 @@ This commit is referred to as a "mer

Re: Deprecating git diff ..; dealing with other ranges

2019-03-12 Thread Duy Nguyen
On Wed, Mar 13, 2019 at 12:26 AM Andreas Schwab wrote: > > On Mär 12 2019, Junio C Hamano wrote: > > > I however think it may be worth making sure that our docs do not > > encourage "diff A..B" and teach "diff A B" when comparing two > > endpoints. That can be done without changing anything in t

Re: [PATCH v2] glossary: add definition for overlay

2019-03-12 Thread Duy Nguyen
On Wed, Mar 13, 2019 at 6:30 AM Thomas Gummerer wrote: > > Add a definition for what overlay means in the context of git, to > clarify the recently introduced overlay-mode in git checkout. > > Helped-by: Elijah Newren > Signed-off-by: Thomas Gummerer > --- > > v2 addresses Elijah's comments (tha

Re: [PATCH v2] stash: pass pathspec as pointer

2019-03-12 Thread Thomas Gummerer
On 03/12, Johannes Schindelin wrote: > Hi Thomas, > > On Mon, 11 Mar 2019, Thomas Gummerer wrote: > > > Passing the pathspec by value is potentially confusing, as the copy is > > only a shallow copy, so save the overhead of the copy, and pass the > > pathspec struct as a pointer. > > Not only co

[PATCH v2] glossary: add definition for overlay

2019-03-12 Thread Thomas Gummerer
Add a definition for what overlay means in the context of git, to clarify the recently introduced overlay-mode in git checkout. Helped-by: Elijah Newren Signed-off-by: Thomas Gummerer --- v2 addresses Elijah's comments (thanks!), using the wording he suggested in [*1*], which I agree is slightl

BUG: Race condition due to reflog expiry in "gc"

2019-03-12 Thread Ævar Arnfjörð Bjarmason
I'm still working on fixing a race condition I encountered in "gc" recently, but am not 100% sure of the fix. So I thought I'd send a braindump of what I have so far in case it jolts any memories. The problem is that when we "gc" we run "reflog expire --all". This iterates over the reflogs, and ta

Re: [GSOC]regarding project selection

2019-03-12 Thread Thomas Gummerer
Hi, please always Cc: the potential mentors of a microproject when you want to discuss it. That makes it much more likely for the mentors to notice your email and discuss it for you. I added Christian, who's listed as possible mentor on the project page to Cc: here. On 03/12, Sushma Unnibhavi w

Re: [RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-12 Thread Roberto Tyley
On Tue, 12 Mar 2019 at 21:34, Jeff King wrote: ... > We could continue to mention _both_ tools, but it's probably better to > pick one in order to avoid overwhelming the user with choice. After all, > one of the purposes here is to reduce friction for first-time or > infrequent contributors. And t

Re: `git add <>` results in "fatal: ... is outside repository"

2019-03-12 Thread Johannes Schindelin
Hi Jack, On Mon, 11 Mar 2019, Jack Adrian Zappa wrote: > Are you sure that you have 8.3 active on the partition you are using? > IIRC, It is not on by default anymore. It is still on by default on system drives (usually C:), but it is switched off on other drives by default. Yet another reason

Re: [PATCH v2] stash: pass pathspec as pointer

2019-03-12 Thread Johannes Schindelin
Hi Thomas, On Mon, 11 Mar 2019, Thomas Gummerer wrote: > Passing the pathspec by value is potentially confusing, as the copy is > only a shallow copy, so save the overhead of the copy, and pass the > pathspec struct as a pointer. Not only confusing, but also wasteful ;-) > In addition use copy_

Re: [RFC/PATCH] packfile: use extra variable to clarify code in use_pack()

2019-03-12 Thread Ramsay Jones
On 12/03/2019 20:26, Jeff King wrote: > On Tue, Mar 12, 2019 at 05:39:13PM +, Ramsay Jones wrote: > >> On 12/03/2019 16:55, Ramsay Jones wrote: >>> From: Jeff King >>> >>> Signed-off-by: Ramsay Jones > > Could definitely use a commit message. I think it's something like: > > We use th

RE: Bug: git for Windows spawning a lot of processes recursively

2019-03-12 Thread Johannes Schindelin
Hi Pierre, On Mon, 11 Mar 2019, Garcia, Pierre wrote: > Hello Johannes, > > I installed the following snapshot on the problematic machine: > Sun, 10 Mar 2019 17:37:25 +0100 > (commit eb5d06f545) > Git for Windows installer: 64-bit > > And the problem is gone! No more issue! Thank you for confi

[RFC/PATCH] point pull requesters to Git Git Gadget

2019-03-12 Thread Jeff King
In the contributing guide and PR template seen by people who open pull requests on GitHub, we mention the submitGit tool, which gives an alternative to figuring out the mailing list. These days we also have the similar Git Git Gadget tool, and we should make it clear that this is also an option. W

Re: [PATCH] Makefile: fix unaligned loads in sha1dc with UBSan

2019-03-12 Thread Jeff King
On Tue, Mar 12, 2019 at 10:17:56PM +0100, Ævar Arnfjörð Bjarmason wrote: > > Here's a commit which updates Git to use the new feature. I've tested it > > with both the in-tree and submodule builds like: > > > > make DC_SHA1_SUBMODULE=Yes SANITIZE=undefined && (cd t && ./t0001-*) > > make DC_SH

Re: [PATCH] Makefile: fix unaligned loads in sha1dc with UBSan

2019-03-12 Thread Ævar Arnfjörð Bjarmason
On Tue, Mar 12 2019, Jeff King wrote: > On Sun, Mar 10, 2019 at 11:37:55PM -0400, Jeff King wrote: > >> Unfortunately, I don't think sha1dc currently supports #defines in that >> direction. The only logic is "if we are on intel, do unaligned loads" >> and "even if we are not on intel, do it anyw

[PATCH] Makefile: fix unaligned loads in sha1dc with UBSan

2019-03-12 Thread Jeff King
On Sun, Mar 10, 2019 at 11:37:55PM -0400, Jeff King wrote: > Unfortunately, I don't think sha1dc currently supports #defines in that > direction. The only logic is "if we are on intel, do unaligned loads" > and "even if we are not on intel, do it anyway". There is no "even if we > are on intel, do

Re: Deprecating git diff ..; dealing with other ranges

2019-03-12 Thread Ævar Arnfjörð Bjarmason
On Tue, Mar 12 2019, Andreas Schwab wrote: > On Mär 12 2019, Junio C Hamano wrote: > >> I however think it may be worth making sure that our docs do not >> encourage "diff A..B" and teach "diff A B" when comparing two >> endpoints. That can be done without changing anything in the code. > > Th

Re: disabling sha1dc unaligned access, was Re: One failed self test on Fedora 29

2019-03-12 Thread Jeff King
On Tue, Mar 12, 2019 at 01:09:42PM +0100, Ævar Arnfjörð Bjarmason wrote: > > To be clear, I do sympathize with the notion that not pulling things > > in-tree keeps our relationship with upstream more disciplined, and that > > has value. I'm just not altogether clear how much it's really hurt us >

Re: [PATCH 3/3] format-patch: --no-clobber refrains from overwriting output files

2019-03-12 Thread Ntentos Stavros
Hello there, Apologies for "jumping in". I was mentioned in [PATCH 0/3] but then for a (good) reason or another, I wasn't CC-ed in the patches. I was the original "suggester" for this feature in the mailing list (https://public-inbox.org/git/cahmhmxxxo4zxcribje2k3mwgwaj7kga_achuemyciesgoc_...@mai

Re: [RFC/PATCH] packfile: use extra variable to clarify code in use_pack()

2019-03-12 Thread Jeff King
On Tue, Mar 12, 2019 at 05:39:13PM +, Ramsay Jones wrote: > On 12/03/2019 16:55, Ramsay Jones wrote: > > From: Jeff King > > > > Signed-off-by: Ramsay Jones Could definitely use a commit message. I think it's something like: We use the "offset" variable for two purposes. It's the offset

Re: Possible race condition with git-rebase + .git/index.lock

2019-03-12 Thread Sergio Durigan Junior
On Tuesday, March 12 2019, Elijah Newren wrote: > On Tue, Mar 12, 2019 at 12:32 PM Sergio Durigan Junior > wrote: >> >> On Tuesday, March 12 2019, Elijah Newren wrote: >> >> > On Tue, Mar 12, 2019 at 9:48 AM Sergio Durigan Junior >> > wrote: >> >> On Tuesday, March 12 2019, Duy Nguyen wrote: >>

Re: Possible race condition with git-rebase + .git/index.lock

2019-03-12 Thread Elijah Newren
On Tue, Mar 12, 2019 at 12:32 PM Sergio Durigan Junior wrote: > > On Tuesday, March 12 2019, Elijah Newren wrote: > > > On Tue, Mar 12, 2019 at 9:48 AM Sergio Durigan Junior > > wrote: > >> On Tuesday, March 12 2019, Duy Nguyen wrote: > >> > >> > On Tue, Mar 12, 2019 at 5:18 AM Sergio Durigan Jun

Re: Possible race condition with git-rebase + .git/index.lock

2019-03-12 Thread Sergio Durigan Junior
On Tuesday, March 12 2019, Elijah Newren wrote: > On Tue, Mar 12, 2019 at 9:48 AM Sergio Durigan Junior > wrote: >> On Tuesday, March 12 2019, Duy Nguyen wrote: >> >> > On Tue, Mar 12, 2019 at 5:18 AM Sergio Durigan Junior >> > wrote: >> >> This works without problems most of the time (well, usu

Re: Possible race condition with git-rebase + .git/index.lock

2019-03-12 Thread Elijah Newren
On Tue, Mar 12, 2019 at 9:48 AM Sergio Durigan Junior wrote: > On Tuesday, March 12 2019, Duy Nguyen wrote: > > > On Tue, Mar 12, 2019 at 5:18 AM Sergio Durigan Junior > > wrote: > >> This works without problems most of the time (well, usually there are > >> conflicts and all, but that's a burden

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Elijah Newren
On Tue, Mar 12, 2019 at 11:21 AM Robert P. J. Day wrote: > > On Tue, 12 Mar 2019, Kevin Daudt wrote: > > ... snip ... > > > The only reason why `:q!` works just for comitting is because there > > is no default message, so the final message ends up empty. > > > > When you do things like git revert

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Robert P. J. Day
On Tue, 12 Mar 2019, Bryan Turner wrote: > On Tue, Mar 12, 2019 at 11:01 AM Robert P. J. Day > wrote: > > > > On Tue, 12 Mar 2019, Bryan Turner wrote: > > > > > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > > > wrote: > > > > > > > > never noticed this before ... when i do a regular "g

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread SZEDER Gábor
On Tue, Mar 12, 2019 at 02:14:37PM -0400, Robert P. J. Day wrote: > On Tue, 12 Mar 2019, Bryan Turner wrote: > > > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > > wrote: > > > > > > never noticed this before ... when i do a regular "git commit" and > > > enter my "vi" edit session and ch

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Bryan Turner
On Tue, Mar 12, 2019 at 11:14 AM Robert P. J. Day wrote: > > On Tue, 12 Mar 2019, Bryan Turner wrote: > > > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > > wrote: > > > > > > never noticed this before ... when i do a regular "git commit" and > > > enter my "vi" edit session and change my

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Robert P. J. Day
On Tue, 12 Mar 2019, Kevin Daudt wrote: ... snip ... > The only reason why `:q!` works just for comitting is because there > is no default message, so the final message ends up empty. > > When you do things like git revert or git commit --amend, there is > already a commit message, which you are

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Bryan Turner
On Tue, Mar 12, 2019 at 11:01 AM Robert P. J. Day wrote: > > On Tue, 12 Mar 2019, Bryan Turner wrote: > > > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > > wrote: > > > > > > never noticed this before ... when i do a regular "git commit" and > > > enter my "vi" edit session and change my

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Robert P. J. Day
On Tue, 12 Mar 2019, Bryan Turner wrote: > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > wrote: > > > > never noticed this before ... when i do a regular "git commit" and > > enter my "vi" edit session and change my mind, i can bail with ":q!", > > regardless of what i've set up as a com

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Kevin Daudt
On Tue, Mar 12, 2019 at 01:22:51PM -0400, Robert P. J. Day wrote: > > never noticed this before ... when i do a regular "git commit" and > enter my "vi" edit session and change my mind, i can bail with ":q!", > regardless of what i've set up as a commit message, and i'll see: > > Aborting com

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Robert P. J. Day
On Tue, 12 Mar 2019, Bryan Turner wrote: > On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day > wrote: > > > > never noticed this before ... when i do a regular "git commit" and > > enter my "vi" edit session and change my mind, i can bail with ":q!", > > regardless of what i've set up as a com

Re: [PATCH 2/2 v3] doc: format pathnames and URLs as monospace.

2019-03-12 Thread Andrei Rybak
On 2019-03-12 16:48, Eric Sunshine wrote: > Thanks. A few comments: > > In patch 1/2: > > * drop the full stop from the first line of the commit message > > * s/futur/future/ in the commit message > > * s/There are false/& positives/ in the commit message > > * s/both, It/both, it/ Also, * s/inco

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Bryan Turner
On Tue, Mar 12, 2019 at 10:23 AM Robert P. J. Day wrote: > > never noticed this before ... when i do a regular "git commit" and > enter my "vi" edit session and change my mind, i can bail with ":q!", > regardless of what i've set up as a commit message, and i'll see: > > Aborting commit due to

[PATCH] submodule: explain first attempt failure clearly

2019-03-12 Thread Jonathan Tan
When cloning with --recurse-submodules a superproject with at least one submodule with HEAD pointing to an unborn branch, the clone goes something like this: Cloning into 'test'... Submodule '' () registered for path '' Cloning into ''... fatal: Couldn't fi

Re: [RFC/PATCH] packfile: use extra variable to clarify code in use_pack()

2019-03-12 Thread Ramsay Jones
On 12/03/2019 16:55, Ramsay Jones wrote: > From: Jeff King > > Signed-off-by: Ramsay Jones > --- > > Hi Jeff, > > I recently tried (yet again) to tidy up some old branches. When I get > around to doing a 'git gc; git fsck' I always take a quick look at > the 'dangling' commits, just before

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Eric Sunshine
On Tue, Mar 12, 2019 at 12:51 PM Elijah Newren wrote: > On Tue, Mar 12, 2019 at 8:37 AM Eric Sunshine wrote: > > It's not much of a datapoint, but I do use "git checkout -B" (and > > therefore would use "git switch -C") periodically (in addition to > > -b/-c, which I use all the time). And, conve

Re: Deprecating git diff ..; dealing with other ranges

2019-03-12 Thread Andreas Schwab
On Mär 12 2019, Junio C Hamano wrote: > I however think it may be worth making sure that our docs do not > encourage "diff A..B" and teach "diff A B" when comparing two > endpoints. That can be done without changing anything in the code. The nice thing about "diff A..B" is that you can c&p the

why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Robert P. J. Day
never noticed this before ... when i do a regular "git commit" and enter my "vi" edit session and change my mind, i can bail with ":q!", regardless of what i've set up as a commit message, and i'll see: Aborting commit due to empty commit message. however, i was just playing with "git rever

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Elijah Newren
On Tue, Mar 12, 2019 at 4:58 AM Duy Nguyen wrote: > On Tue, Mar 12, 2019 at 12:25 AM Elijah Newren wrote: > > On Mon, Mar 11, 2019 at 4:47 AM Duy Nguyen wrote: > > > On Mon, Mar 11, 2019 at 6:16 PM Phillip Wood > > > wrote: > > > > On 08/03/2019 09:57, Nguyễn Thái Ngọc Duy wrote: > > > > > "g

[RFC/PATCH] packfile: use extra variable to clarify code in use_pack()

2019-03-12 Thread Ramsay Jones
From: Jeff King Signed-off-by: Ramsay Jones --- Hi Jeff, I recently tried (yet again) to tidy up some old branches. When I get around to doing a 'git gc; git fsck' I always take a quick look at the 'dangling' commits, just before a 'git gc --prune=now'. I had no recollection of this commit, f

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Elijah Newren
On Tue, Mar 12, 2019 at 8:37 AM Eric Sunshine wrote: > > On Tue, Mar 12, 2019 at 8:19 AM Duy Nguyen wrote: > > On Tue, Mar 12, 2019 at 3:51 AM Phillip Wood > > wrote: > > > I tend to agree with this but that's probably because I don't really use > > > checkout -B. I'm not sure if it's widely us

Re: Possible race condition with git-rebase + .git/index.lock

2019-03-12 Thread Sergio Durigan Junior
On Tuesday, March 12 2019, Duy Nguyen wrote: > On Tue, Mar 12, 2019 at 5:18 AM Sergio Durigan Junior > wrote: >> This works without problems most of the time (well, usually there are >> conflicts and all, but that's a burden I have to carry). However, >> sometimes I notice that git fails with: >

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Elijah Newren
On Tue, Mar 12, 2019 at 4:06 AM Phillip Wood wrote: > > Hi Elijah > > On 11/03/2019 17:54, Elijah Newren wrote: > > A few other comments that I thought of while responding elsewhere in > > the thread that didn't make sense to include elsewhere... > > > > On Fri, Mar 8, 2019 at 2:00 AM Nguyễn Thái

Re: [PATCH 2/2 v3] doc: format pathnames and URLs as monospace.

2019-03-12 Thread Eric Sunshine
On Tue, Mar 12, 2019 at 9:16 AM Matthieu Moy wrote: > Corentin BOMPARD writes: > > Changes: We listen to Matthieu MOY and Eric SUNSHINE's remarks about > > our mistakes on the last patch. > > This addresses all my previous remarks, so this (patches 1 and 2) is now > > Reviewed-by: Matthieu Moy

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Eric Sunshine
On Tue, Mar 12, 2019 at 8:19 AM Duy Nguyen wrote: > On Tue, Mar 12, 2019 at 3:51 AM Phillip Wood > wrote: > > I tend to agree with this but that's probably because I don't really use > > checkout -B. I'm not sure if it's widely used or not. I do find checkout > > -b convenient though. > > Yeah I

[PATCH] t4150: remove unused variable

2019-03-12 Thread Andrei Rybak
In commit 735285b403 ("am: fix signoff when other trailers are present", 2017-08-08) tests using variable $signoff were rewritten and it is no longer used, so just remove it from the test setup. Signed-off-by: Andrei Rybak --- t/t4150-am.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-

Re: [PATCH 3/4] repack: add --sparse and pass to pack-objects

2019-03-12 Thread Dr N.W. Filardo
On 2019-03-12 13:47, Derrick Stolee wrote: On 3/12/2019 9:18 AM, Nathaniel Filardo wrote: The sparse connectivity algorithm saves a whole lot of time when there are UNINTERESTING trees around. Interesting! Do you have some performance numbers to include with this statement? Not UNINTERESTING

Mes salutations au nom du Seigneur.

2019-03-12 Thread Erica Nomani
Mes salutations au nom du Seigneur. Je suis Mme Erica Nomani, une veuve âgée de 58 ans de la République d'Azerbaïdjan mais vivant actuellement au Angleterre (England). Je suis légalement marié au regretté Dr Castillo Nomani, qui travaillait pour l'ambassade d'Azerbaïdjan en Angleterre avant son

Re: [PATCH 2/4] revision walk: optionally use sparse reachability

2019-03-12 Thread Derrick Stolee
On 3/12/2019 9:18 AM, Nathaniel Filardo wrote: > The only caller that passes a non-zero value to prepare_revision_walk > after this patch is builtin/pack-objects. Without this, sparsity seems > to do little good therein, as prepare_revision_walk will densely > propagate UNINTERESTING flags from tr

Re: [PATCH 3/4] repack: add --sparse and pass to pack-objects

2019-03-12 Thread Derrick Stolee
On 3/12/2019 9:18 AM, Nathaniel Filardo wrote: > The sparse connectivity algorithm saves a whole lot of time when there > are UNINTERESTING trees around. Interesting! Do you have some performance numbers to include with this statement? > @@ -48,6 +49,10 @@ static int repack_config(const char *var,

[PATCH 2/4] revision walk: optionally use sparse reachability

2019-03-12 Thread Nathaniel Filardo
The only caller that passes a non-zero value to prepare_revision_walk after this patch is builtin/pack-objects. Without this, sparsity seems to do little good therein, as prepare_revision_walk will densely propagate UNINTERESTING flags from trees to tree contents, before mark_edges_uninteresting h

[PATCH 4/4] repack: optionally assume transitive kept packs

2019-03-12 Thread Nathaniel Filardo
If the user is careful to mark .pack files as kept only when they refer to (other) kept packs, then we can rely on this when walking the object graph in subsequent repack operations and reduce the time and memory spent building the object graph. Towards that end, then, teach git repack to enumerat

[PATCH 0/4] Speed up repacking when lots of pack-kept objects

2019-03-12 Thread Nathaniel Filardo
This patch series improves handling of very large repositories, as generated by, for example, bup (https://github.com/bup/bup). Prolonged operation thereof creates quite a lot of small pack files; repacking improves filesystem performance of the objects/pack directory, but is quite expensive, in t

[PATCH 1/4] count-objects: report statistics about kept packs

2019-03-12 Thread Nathaniel Filardo
Specifically: number of kept packs, size of kept packs (and indexes), and number of objects in kept packs. Signed-off-by: Nathaniel Filardo --- builtin/count-objects.c | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/builtin/count-objects.c b/builtin/count-o

[PATCH v3 10/11] partial-clone: add multiple remotes in the doc

2019-03-12 Thread Christian Couder
While at it, let's remove a reference to ODB effort as the ODB effort has been replaced by directly enhancing partial clone and promisor remote features. Signed-off-by: Christian Couder --- Documentation/technical/partial-clone.txt | 83 --- 1 file changed, 58 insertions(+),

[PATCH v3 11/11] remote: add promisor and partial clone config to the doc

2019-03-12 Thread Christian Couder
Signed-off-by: Christian Couder --- Documentation/config/remote.txt | 8 1 file changed, 8 insertions(+) diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt index 6c4cad83a2..a8e6437a90 100644 --- a/Documentation/config/remote.txt +++ b/Documentation/config/re

[PATCH v3 09/11] t0410: test fetching from many promisor remotes

2019-03-12 Thread Christian Couder
From: Christian Couder This shows that it is now possible to fetch objects from more than one promisor remote, and that fetching from a new promisor remote can configure it as one. Signed-off-by: Christian Couder --- t/t0410-partial-clone.sh | 47 +++- 1 fil

[PATCH v3 03/11] promisor-remote: implement promisor_remote_get_direct()

2019-03-12 Thread Christian Couder
From: Christian Couder This is implemented for now by calling fetch_objects(). It fetches from all the promisor remotes. Signed-off-by: Christian Couder --- promisor-remote.c | 17 + promisor-remote.h | 1 + 2 files changed, 18 insertions(+) diff --git a/promisor-remote.c b/p

[PATCH v3 08/11] builtin/fetch: remove unique promisor remote limitation

2019-03-12 Thread Christian Couder
As the infrastructure for more than one promisor remote has been introduced in previous patches, we can remove code that forbids the registration of more than one promisor remote. Signed-off-by: Christian Couder --- builtin/fetch.c | 20 +--- 1 file changed, 5 insertions(+), 15 d

[PATCH v3 06/11] Use promisor_remote_get_direct() and has_promisor_remote()

2019-03-12 Thread Christian Couder
Instead of using the repository_format_partial_clone global and fetch_objects() directly, let's use has_promisor_remote() and promisor_remote_get_direct(). This way all the configured promisor remotes will be taken into account, not only the one specified by extensions.partialClone. Also when clo

[PATCH v3 07/11] promisor-remote: parse remote.*.partialclonefilter

2019-03-12 Thread Christian Couder
This makes it possible to specify a different partial clone filter for each promisor remote. Signed-off-by: Christian Couder --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 27 +++ list-objects-filter-options.h | 3 ++- promisor-remote.c

[PATCH v3 05/11] promisor-remote: use repository_format_partial_clone

2019-03-12 Thread Christian Couder
A remote specified using the extensions.partialClone config option should be considered a promisor remote too. This remote should be at the end of the promisor remote list, so that it is used only if objects have not been found in other remotes. Signed-off-by: Christian Couder --- promisor-remo

[PATCH v3 04/11] promisor-remote: add promisor_remote_reinit()

2019-03-12 Thread Christian Couder
From: Christian Couder We will need to reinitialize the promisor remote configuration as we will make some changes to it in a later commit. Signed-off-by: Christian Couder --- promisor-remote.c | 14 -- promisor-remote.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) di

[PATCH v3 02/11] Add initial support for many promisor remotes

2019-03-12 Thread Christian Couder
From: Christian Couder The promisor-remote.{c,h} files will contain functions to manage many promisor remotes. We expect that there will not be a lot of promisor remotes, so it is ok to use a simple linked list to manage them. Helped-by: Jeff King Signed-off-by: Christian Couder --- Makefile

[PATCH v3 00/11] Many promisor remotes

2019-03-12 Thread Christian Couder
This path series is a follow up from the "remote odb" patch series that I sent last year, which were a follow up from previous series. See the links section for more information. The goal of this patch series is to make it possible to have and to fetch missing objects from multiple remotes instead

[PATCH v3 01/11] fetch-object: make functions return an error code

2019-03-12 Thread Christian Couder
From: Christian Couder The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- fetch-object.c | 13 - fetch-object.h | 4 ++-- sha1-file.c| 4 +

[PATCH 3/4] repack: add --sparse and pass to pack-objects

2019-03-12 Thread Nathaniel Filardo
The sparse connectivity algorithm saves a whole lot of time when there are UNINTERESTING trees around. --- Documentation/git-repack.txt | 4 builtin/repack.c | 10 ++ 2 files changed, 14 insertions(+) diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.t

Re: [PATCH 2/2 v3] doc: format pathnames and URLs as monospace.

2019-03-12 Thread Matthieu Moy
Corentin BOMPARD writes: > Applying CodingGuidelines about monospace on pathnames and URLs. > > See Documentation/CodingGuidelines.txt for more information. > > Signed-off-by: Corentin BOMPARD > Signed-off-by: Nathan BERBEZIER > Signed-off-by: Pablo CHABANNE > Signed-off-by: Matthieu MOY > --

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Duy Nguyen
On Tue, Mar 12, 2019 at 3:51 AM Phillip Wood wrote: > > then it'd make sense to use --recreate instead. But if you > > think some might adopt a workflow where they just use -C without first > > trying -c ("create this branch, and I don't care if I made it before > > just create it here"), then --

Re: disabling sha1dc unaligned access, was Re: One failed self test on Fedora 29

2019-03-12 Thread Ævar Arnfjörð Bjarmason
On Tue, Mar 12 2019, Jeff King wrote: > On Tue, Mar 12, 2019 at 09:53:41AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> There's a at least a couple of aspects to this. >> >> One is whether we should have the submodule in >> sha1collisiondetection/. I agree that's probably a bad idea now >> per-se.

Re: [PATCH] repack: enable bitmaps by default on bare repos

2019-03-12 Thread Jeff King
On Tue, Mar 12, 2019 at 06:49:54AM -0400, Jeff King wrote: > I'm not sure what we're trying to accomplish with this unpacking, > though. Running "git repack -ad" should generate bitmaps whether the > objects were already in a single pack or not. So I think this test can > just be: > > git clone

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Duy Nguyen
On Tue, Mar 12, 2019 at 12:25 AM Elijah Newren wrote: > > On Mon, Mar 11, 2019 at 4:47 AM Duy Nguyen wrote: > > > > On Mon, Mar 11, 2019 at 6:16 PM Phillip Wood > > wrote: > > > > > > Hi Duy > > > > > > On 08/03/2019 09:57, Nguyễn Thái Ngọc Duy wrote: > > > > "git checkout" doing too many thing

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Duy Nguyen
On Tue, Mar 12, 2019 at 12:03 AM Phillip Wood wrote: > > Hi Duy > > On 11/03/2019 11:47, Duy Nguyen wrote: > > On Mon, Mar 11, 2019 at 6:16 PM Phillip Wood > > wrote: > >> > >> > >> Hi Duy > >> > >> On 08/03/2019 09:57, Nguyễn Thái Ngọc Duy wrote: > >>> "git checkout" doing too many things is a

[GSOC]regarding project selection

2019-03-12 Thread Sushma Unnibhavi
I am interested to do a project on improving git log --oneline.I can program in C language,I have learnt how to send patches and I am also comfortable with using git.I wanted to know what are the prerequisites for doing the project.Can I get some help regarding this matter.

Re: [PATCH v7 8/8] cherry-pick/revert: add scissors line on merge conflict

2019-03-12 Thread Phillip Wood
Hi Denton I've got a couple of small comments, but this looks fine to me On 11/03/2019 03:42, Denton Liu wrote: Fix a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Signed-off-by: Denton Liu --- Do

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Phillip Wood
Hi Elijah On 11/03/2019 17:54, Elijah Newren wrote: A few other comments that I thought of while responding elsewhere in the thread that didn't make sense to include elsewhere... On Fri, Mar 8, 2019 at 2:00 AM Nguyễn Thái Ngọc Duy wrote: +-m:: +--merge:: + If you have local modificatio

Re: disabling sha1dc unaligned access, was Re: One failed self test on Fedora 29

2019-03-12 Thread Jeff King
On Tue, Mar 12, 2019 at 09:53:41AM +0100, Ævar Arnfjörð Bjarmason wrote: > There's a at least a couple of aspects to this. > > One is whether we should have the submodule in > sha1collisiondetection/. I agree that's probably a bad idea now > per-se. Honestly I wasn't expecting the answer when I s

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-12 Thread Phillip Wood
Hi Elijah On 11/03/2019 22:04, Elijah Newren wrote: On Mon, Mar 11, 2019 at 1:51 PM Phillip Wood wrote: On 11/03/2019 17:24, Elijah Newren wrote: On Mon, Mar 11, 2019 at 4:47 AM Duy Nguyen wrote: On Mon, Mar 11, 2019 at 6:16 PM Phillip Wood wrote: On 08/03/2019 09:57, Nguyễn Thái Ngọc Duy

  1   2   >