Re: [RFC PATCH 0/3] grep: don't add subrepos to in-memory alternates

2019-09-18 Thread Matheus Tavares Bernardino
On Wed, Sep 18, 2019 at 4:55 PM Junio C Hamano wrote: > > Matheus Tavares writes: > [...] > > - textconv cache is written to the_repository's object database even for > > submodules. Should it perhaps be written to submodules' odb instead? > > You mention "is written", but that is what happens

Re: What's cooking in git.git (Sep 2019, #02; Wed, 18)

2019-09-18 Thread Martin Ågren
Hi Junio, On Thu, 19 Sep 2019 at 01:44, Junio C Hamano wrote: > * ma/asciidoctor-refmiscinfo (2019-09-16) 3 commits > - doc-diff: replace --cut-header-footer with --cut-footer > - asciidoctor-extensions: provide `` > - Doc/Makefile: give mansource/-version/-manual attributes > > Update suppo

Re: What's cooking in git.git (Sep 2019, #02; Wed, 18)

2019-09-18 Thread Jonathan Tan
> * jt/cache-tree-avoid-lazy-fetch-during-merge (2019-09-09) 1 commit > - cache-tree: do not lazy-fetch tentative tree > > The cache-tree code has been taught to be less aggressive in > attempting to see if a tree object it computed already exists in > the repository. > > Waiting for a respo

What's cooking in git.git (Sep 2019, #02; Wed, 18)

2019-09-18 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. We have a new maintainer for git-g

Re: [PATCH v2] merge-recursive: symlink's descendants not in way

2019-09-18 Thread Elijah Newren
On Wed, Sep 18, 2019 at 1:27 PM Jonathan Tan wrote: > > When the working tree has: > - bar (directory) > - bar/file (file) > - foo (symlink to .) > > (note that lstat() for "foo/bar" would tell us that it is a directory) > > and the user merges a commit that deletes the foo symlink and instead

Re: [PATCH] ls-remote: create '--count' option

2019-09-18 Thread Kamil Domański
On 9/18/19 8:28 AM, Johannes Sixt wrote: Am 18.09.19 um 02:11 schrieb Kamil Domański: Create a '--count' option for ls-remote, based on the one from for-each-ref. This allows e.g. to return only the first result from a sorted list of refs. Signed-off-by: Kamil Domański --- Documentation/git-

Re: Promoting Ethnics-Ess-Nix, a friends-based search-engine

2019-09-18 Thread Klaus Sembritzki
Please read the 8-point survival-sheet of a few days ago now. Don't forget about food- and water-poisoning. On Wed, Sep 18, 2019 at 10:09 PM Klaus Sembritzki wrote: > > Hello all, > > We built upon the idea of basing the future internet on 4 * SHA-256. > > Our goal was always to achieve a probabi

Re: git-gui: duplicated key binds?

2019-09-18 Thread Pratyush Yadav
On 18/09/19 01:24PM, Birger Skogeng Pedersen wrote: > Hi, > > > It looks to me like there are a lot of key binds duplicated in the > git-gui source. > > For instance, Ctrl/Cmd+Enter are bound in two lines: > bind $ui_comm <$M1B-Key-Return> {do_commit;break} > and > bind . <$M1B-Key-Return> do_

[PATCH v2] merge-recursive: symlink's descendants not in way

2019-09-18 Thread Jonathan Tan
When the working tree has: - bar (directory) - bar/file (file) - foo (symlink to .) (note that lstat() for "foo/bar" would tell us that it is a directory) and the user merges a commit that deletes the foo symlink and instead contains: - bar (directory, as above) - bar/file (file, as above)

Re: Promoting Ethnics-Ess-Nix, a friends-based search-engine

2019-09-18 Thread Klaus Sembritzki
Hello all, We built upon the idea of basing the future internet on 4 * SHA-256. Our goal was always to achieve a probability of 0 for a hack with probability 1. This is achieved by storing all files spread over the internet, using heterogeneous hashes. This is mandatory, as the kernel of the pro

Re: [PATCH] sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()

2019-09-18 Thread Derrick Stolee
On 9/18/2019 12:35 PM, René Scharfe wrote: > Pass the target strbuf to the callback function grab_nth_branch_switch() > by reference so that it can add the result string directly instead of > having it put the string into a temporary strbuf first. This gets rid > of an extra allocation and a strin

Re: [RFC PATCH 0/3] grep: don't add subrepos to in-memory alternates

2019-09-18 Thread Junio C Hamano
Matheus Tavares writes: > Make git-grep --recurse-submodules stop adding subrepos to the in-memory > alternates list and, instead, pass a reference to the subrepo struct > down to the threads. Nice. This is done by updating all the codepaths used by grep to use the lower-level helper functions

Re: [GIT PULL] git-gui pull request

2019-09-18 Thread Junio C Hamano
Denton Liu writes: > Hi Pratyush, > > Since you're the maintainer now, you should submit a patch to > Documentation/SubmittingPatches to change > > - `git-gui/` comes from git-gui project, maintained by Pat Thoyts: > > git://repo.or.cz/git-gui.git > > to have your own informat

Re: git-gui: missing some patches from git?

2019-09-18 Thread Pratyush Yadav
On 18/09/19 10:49AM, Junio C Hamano wrote: > Pratyush Yadav writes: > > > Assuming I have git.git cloned in ../git (relative to git-gui.git), I > > ran: > > > > git pull -Xsubtree=git-gui ../git $branches > > > > instead of: > > > > git merge $branches > > > > because git-gui's tree doesn't

[PATCH v3] hg-to-git: make it compatible with both python3 and python2

2019-09-18 Thread Hervé Beraud
Python 2 is EOL at the end of 2019, many distros and systems now come with python 3 as their default version. These changes introduce a syntaxe compatible with the both versions of python and so with the nearly future python standard. Signed-off-by: Hervé Beraud --- contrib/hg-to-git/hg-to-git.

Re: git-gui: missing some patches from git?

2019-09-18 Thread Junio C Hamano
Pratyush Yadav writes: > Assuming I have git.git cloned in ../git (relative to git-gui.git), I > ran: > > git pull -Xsubtree=git-gui ../git $branches > > instead of: > > git merge $branches > > because git-gui's tree doesn't have those commits and branches yet, so > we can't merge straight

Re: git-gui: missing some patches from git?

2019-09-18 Thread Junio C Hamano
Birger Skogeng Pedersen writes: > For example, I created a patch back in March 2018[3]. Junio pulled it > so the changes are really there in git/git-gui/git-gui.sh (see this[4] > line). This was while there was no git-gui maintainer. I guess the > change never got merged to git-gui, but directly

Re: [PATCH] doc: fix reference to --ignore-submodules

2019-09-18 Thread Junio C Hamano
Thanks.

Re: [PATCH] ls-remote: create '--count' option

2019-09-18 Thread Junio C Hamano
Johannes Sixt writes: > Am 18.09.19 um 02:11 schrieb Kamil Domański: >> Create a '--count' option for ls-remote, based on the one from >> for-each-ref. This allows e.g. to return only the first result >> from a sorted list of refs. >> >> Signed-off-by: Kamil Domański >> --- >> Documentation/gi

Re: [PATCH 4/9] sparse-checkout: 'add' subcommand

2019-09-18 Thread Derrick Stolee
On 9/18/2019 10:56 AM, Elijah Newren wrote: > On Wed, Sep 18, 2019 at 6:55 AM Derrick Stolee wrote: >> >> On 8/23/2019 7:30 PM, Elijah Newren wrote: >>> On Tue, Aug 20, 2019 at 8:12 AM Derrick Stolee via GitGitGadget >>> wrote: > ... diff --git a/t/t1091-sparse-checkout-builtin.sh

Re: [PATCH v2] hg-to-git: make it compatible with both python3 and python2

2019-09-18 Thread Junio C Hamano
Hervé Beraud writes: > Python 2 is EOL at the end of 2019, many distros > and systems now come with python 3 is the default version. Grammo. s/is the/as their/ or something like that to fix. > These changes introduce a syntaxe compatible with the both versions of > python and so with the nearl

Re: git-gui: missing some patches from git?

2019-09-18 Thread Denton Liu
On Wed, Sep 18, 2019 at 08:44:04PM +0530, Pratyush Yadav wrote: > On 18/09/19 02:27AM, Denton Liu wrote: > > On Wed, Sep 18, 2019 at 09:02:37AM +0200, Birger Skogeng Pedersen wrote: > > > Hi Pratyush, > > > > > > > > > I was comparing your git-gui repo[1] with the source code of > > > git/git-gui

[PATCH] sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()

2019-09-18 Thread René Scharfe
Pass the target strbuf to the callback function grab_nth_branch_switch() by reference so that it can add the result string directly instead of having it put the string into a temporary strbuf first. This gets rid of an extra allocation and a string copy. Signed-off-by: René Scharfe --- Patch for

Re: git-gui: duplicated key binds?

2019-09-18 Thread Birger Skogeng Pedersen
Doing some more experimenting with these, I realize I was completely wrong about them. Please disregard my previous email :-) Birger

Re: git-gui: missing some patches from git?

2019-09-18 Thread Pratyush Yadav
On 18/09/19 02:27AM, Denton Liu wrote: > On Wed, Sep 18, 2019 at 09:02:37AM +0200, Birger Skogeng Pedersen wrote: > > Hi Pratyush, > > > > > > I was comparing your git-gui repo[1] with the source code of > > git/git-gui[2]. There seems to be a couple of things missing. > > > > For example, I cre

Re: Promoting Ethnics-Ess-Nix, a friends-based search-engine

2019-09-18 Thread Klaus Sembritzki
Hello all, Manipulating our data is hereby proven to be false, and perpetual false is done by injust-people. 4 * SHA-256 is on nail's head, which is the case for unstable, and therefore false, actions. Hacking 4 * SHA-256 is therefore false, manipulating our data in general is therefore also fal

Re: [PATCH 4/9] sparse-checkout: 'add' subcommand

2019-09-18 Thread Elijah Newren
On Wed, Sep 18, 2019 at 6:55 AM Derrick Stolee wrote: > > On 8/23/2019 7:30 PM, Elijah Newren wrote: > > On Tue, Aug 20, 2019 at 8:12 AM Derrick Stolee via GitGitGadget > > wrote: > >> ... > >> diff --git a/t/t1091-sparse-checkout-builtin.sh > >> b/t/t1091-sparse-checkout-builtin.sh > >> index b

Potential Bug with Client Certificate Authentication (mTLS)

2019-09-18 Thread Scott Guymer
I'm trying to pull via HTTPS from a TFS server that has Client Certificate authentication configured. I believe I have all the certificates in the right format and simply using curl with the same certs works but when trying to clone via git it does not seem to negotiate the client certificate auth

Re: Promoting Ethnics-Ess-Nix, a friends-based search-engine

2019-09-18 Thread Klaus Sembritzki
Hello all, The new, theoretically unhackable internet, will be based on 4 * SHA-256. Cheers, Klaus Sembritzki On Wed, Sep 18, 2019 at 2:35 PM Klaus Sembritzki wrote: > > Sehrgeerdete Damen und Herren, > > Innerbayrische Diskussionen lieferten die folgenden Einsichten. > > - Transitivity=freedom

Re: [PATCH 4/9] sparse-checkout: 'add' subcommand

2019-09-18 Thread Derrick Stolee
On 8/23/2019 7:30 PM, Elijah Newren wrote: > On Tue, Aug 20, 2019 at 8:12 AM Derrick Stolee via GitGitGadget > wrote: >> >> From: Derrick Stolee >> >> The 'git sparse-checkout add' subcommand takes a list of patterns >> over stdin and writes them to the sparse-checkout file. Then, it >> updates t

Re: [PATCH 3/9] clone: add --sparse mode

2019-09-18 Thread Derrick Stolee
On 8/23/2019 7:17 PM, Elijah Newren wrote: > On Tue, Aug 20, 2019 at 8:12 AM Derrick Stolee via GitGitGadget > wrote: >> >> From: Derrick Stolee >> >> When someone wants to clone a large repository, but plans to work >> using a sparse-checkout file, they either need to do a full >> checkout first

Re: Promoting Ethnics-Ess-Nix, a friends-based search-engine

2019-09-18 Thread Klaus Sembritzki
Sehrgeerdete Damen und Herren, Innerbayrische Diskussionen lieferten die folgenden Einsichten. - Transitivity=freedom, meaning looking into the future, is exactly what hell-creatures are incapable of doing. - They cut themselves on paper. - Die sin so blehd, die brechen sich den Finger im Orsch o

Re: [RFC/PATCH] commit-graph: generation v5 (backward compatible date ceiling)

2019-09-18 Thread Derrick Stolee
On 9/18/2019 4:43 AM, Jakub Narebski wrote: > Derrick Stolee writes: >> On 6/25/2019 3:51 AM, Jakub Narebski wrote: >>> Jakub Narebski writes: Derrick Stolee writes: > [...] O.K., so the "generation number v2 (legacy)" would be incremental and backward-compatibile in use (though n

git-gui: duplicated key binds?

2019-09-18 Thread Birger Skogeng Pedersen
Hi, It looks to me like there are a lot of key binds duplicated in the git-gui source. For instance, Ctrl/Cmd+Enter are bound in two lines: bind $ui_comm <$M1B-Key-Return> {do_commit;break} and bind . <$M1B-Key-Return> do_commit I guess the first one is specified to work in the commit message

[OFF-TOPIC] How to contribute to Git full-time?

2019-09-18 Thread Denton Liu
[Sorry if this isn't the right place for this but I think that this is probably the best place to get in touch with fellow Git developers ;)] Hello all, It's hard to believe it but I'm going to be graduating university soon. Since I work on Git in my spare time for fun, I'd love it if I could do

Re: git-gui: missing some patches from git?

2019-09-18 Thread Denton Liu
On Wed, Sep 18, 2019 at 09:02:37AM +0200, Birger Skogeng Pedersen wrote: > Hi Pratyush, > > > I was comparing your git-gui repo[1] with the source code of > git/git-gui[2]. There seems to be a couple of things missing. > > For example, I created a patch back in March 2018[3]. Junio pulled it > s

[RFC/PATCH] commit-graph: generation v5 (backward compatible date ceiling)

2019-09-18 Thread Jakub Narebski
Derrick Stolee writes: > On 6/25/2019 3:51 AM, Jakub Narebski wrote: >> Jakub Narebski writes: >>> Derrick Stolee writes: [...] >>> O.K., so the "generation number v2 (legacy)" would be incremental and >>> backward-compatibile in use (though not in generation and validation). [...] >>> Do you ha

[PATCH v2] hg-to-git: make it compatible with both python3 and python2

2019-09-18 Thread Hervé Beraud
Python 2 is EOL at the end of 2019, many distros and systems now come with python 3 is the default version. These changes introduce a syntaxe compatible with the both versions of python and so with the nearly future python standard. Introduced changes: --- Rewriting features that

git-gui: missing some patches from git?

2019-09-18 Thread Birger Skogeng Pedersen
Hi Pratyush, I was comparing your git-gui repo[1] with the source code of git/git-gui[2]. There seems to be a couple of things missing. For example, I created a patch back in March 2018[3]. Junio pulled it so the changes are really there in git/git-gui/git-gui.sh (see this[4] line). This was whi

[PATCH] doc: fix reference to --ignore-submodules

2019-09-18 Thread Alex Henrie
Signed-off-by: Alex Henrie --- Documentation/gitmodules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index a66e95b70c..b7f5e39d4c 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@