bugreport: git checkout --recurse-submodules overwrites unstaged changes

2018-12-18 Thread Petr Gregor
Hello, I believe we found a reproducible bug in git checkout --recurse-submodules command. Documentation says, that this command should not overwrite unstaged changes in submodules unless -f is given. In reality local changes can be accidentally overwritten even without -f flag. I reproduced the i

Re: Can git choose perl at runtime?

2018-12-18 Thread Carlo Arenas
On Tue, Dec 18, 2018 at 7:29 PM John Passaro wrote: > > I recently submitted my first patch using OSX and found the experience > frustrating, for reasons that have come up on the list before, > concerning git-send-email and perl dependencies that you need to be > root to update. you can install t

Re: [PATCH 0/4] Expose gpgsig in pretty-print

2018-12-18 Thread John Passaro
On Fri, Dec 14, 2018 at 6:10 PM John Passaro wrote: > All seems to work fine when I treat %Gs as a detached signature. In light of this, my best guess as to why the cleartext PGP message didn't verify properly is that the commit data normally doesn't end with \n, but as far as I can tell there's n

Re: [PATCH] log: add %S option (like --source) to log --format

2018-12-18 Thread Issac Trotts
On Tue, Dec 18, 2018 at 9:14 AM Issac Trotts wrote: > > Hi Peff, thanks for the feedback. I tried a variant of the command you > showed and it yielded a seg fault: > ``` > [ issactrotts ~/git ] ./git diff-tree -s --pretty=tformat:'%S %H %s' HEAD > Segmentation fault: 11 > ``` > I'll see if I can t

Re: Can git choose perl at runtime?

2018-12-18 Thread Jonathan Nieder
Hi John, John Passaro wrote: > https://public-inbox.org/git/878t55qga6@evledraar.gmail.com/ > > The struggle is that Mac's package manager Homebrew has opted, > apparently with some finality, to no longer support linking to a user > perl at build time. PERL_PATH is hard-coded to link to the s

Can git choose perl at runtime?

2018-12-18 Thread John Passaro
I recently submitted my first patch using OSX and found the experience frustrating, for reasons that have come up on the list before, concerning git-send-email and perl dependencies that you need to be root to update. Last seen here: https://public-inbox.org/git/878t55qga6@evledraar.gmail.com/

error: Use of uninitialized value $hash in chomp

2018-12-18 Thread Andrew Shearer
Hello I am using a "git svn clone" command to extract our project history from svn into git. About 30m into the process it fails with: r50739 = 2a1491de1353b1e3cce50d8f9d383407218a44f1 (refs/remotes/git-svn) fatal: Cannot open '.git/Git_svn_delta_33316_0_UkxiJV': Permission denied Use of uniniti

Re: [PATCH 2/3] setup: do not use invalid `repository_format`

2018-12-18 Thread brian m. carlson
On Tue, Dec 18, 2018 at 08:25:27AM +0100, Martin Ågren wrote: > I fully admit to not understanding all of this setup code, neither in > its current incarnation, nor in terms of an ideal end game. This check > seems like a good thing to do though. It's definitely complex. > diff --git a/setup.c

Re: [PATCH v5 1/1] protocol: advertise multiple supported versions

2018-12-18 Thread Josh Steadmon
On 2018.12.14 23:39, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Dec 14 2018, Josh Steadmon wrote: > > > On 2018.12.14 21:20, Ævar Arnfjörð Bjarmason wrote: > >> > >> On Fri, Nov 16 2018, Josh Steadmon wrote: > >> > >> I started looking at this to address > >> https://public-inbox.org/git/nycvar.q

Re: Git hooks don't run while commiting in worktree via git-gui

2018-12-18 Thread Johannes Schindelin
Hi Ivan, On Tue, 18 Dec 2018, Иван Могиш wrote: > Hello. > There is a little difference in behavior when you are committing to > the worktree from CLI or some git client (tortoisegit/sourcetree) and > embedded git gui. > > If you configure git hooks in your repository and then add a worktree > (

Skipping history and save bandwidth: how can I jump between shallow clones, without sending unused blobs

2018-12-18 Thread Robin H. Johnson
I think this is encapsulated in the v2/promisor work, but wanted to check how close that was to fruition, and that it would indeed be possible. This would enable replacement of any workflow that presently uses rsync to update. If I have a clone (ideally shallow already) at A, I'd like to update i

Re: [PATCH v4 2/7] pretty: allow %(trailers) options with explicit value

2018-12-18 Thread Anders Waldenborg
Junio C Hamano writes: > That way, we can handle %(trailers:only=bogo) more sensibly, > no? Syntactically we can recognize that the user wanted to give > 'bogo' as the value to 'only', and say "'bogo' is not a boolean" if > we did so. I agree that proper error reporting for the pretty formattin

[PATCH] upload-pack: teach deepen-relative in protocol v2

2018-12-18 Thread Jonathan Tan
Commit 685fbd3291 ("fetch-pack: perform a fetch using v2", 2018-03-15) attempted to teach Git deepen-relative in protocol v2 (among other things), but it didn't work: (1) fetch-pack.c needs to emit "deepen-relative". (2) upload-pack.c needs to ensure that the correct deepen_relative variabl

Re: [PATCH v4 0/3] Add commit-graph fuzzer and fix buffer overflow

2018-12-18 Thread Josh Steadmon
On 2018.12.18 12:35, Jeff King wrote: > On Thu, Dec 13, 2018 at 11:43:55AM -0800, Josh Steadmon wrote: > > > Add a new fuzz test for the commit graph and fix a buffer read-overflow > > that it discovered. Additionally, fix the Makefile instructions for > > building fuzzers. > > > > Changes since

Re: [PATCH v2] Simplify handling of setup_git_directory_gently() failure cases.

2018-12-18 Thread Erin Dahlgren
Hi Peff, On Tue, Dec 18, 2018 at 9:54 AM Jeff King wrote: > > On Sat, Dec 15, 2018 at 05:05:08PM -0800, Erin Dahlgren wrote: > > > setup_git_directory_gently() expects two types of failures to > > discover a git directory (e.g. .git/): > > [...] > > When I read your subject line, I'll admit to ha

Re: [PATCH v2] Simplify handling of setup_git_directory_gently() failure cases.

2018-12-18 Thread Erin Dahlgren
Sorry Johannes for the repeat message, I failed to send to all. On Tue, Dec 18, 2018 at 4:35 AM Johannes Schindelin wrote: > > Hi Erin, > > On Sat, 15 Dec 2018, Erin Dahlgren wrote: > > > diff --git a/setup.c b/setup.c > > index 1be5037..e1a9e17 100644 > > --- a/setup.c > > +++ b/setup.c > > @@ -

Re: commit-graph idea: warn when disabled for incompatible repositories

2018-12-18 Thread Derrick Stolee
On 12/18/2018 1:21 PM, Ævar Arnfjörð Bjarmason wrote: diff --git a/builtin/gc.c b/builtin/gc.c index 871a56f1c5..702568b70d 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -662,9 +662,14 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (pack_garbage.nr > 0)

Re: commit-graph idea: warn when disabled for incompatible repositories

2018-12-18 Thread Ævar Arnfjörð Bjarmason
On Tue, Dec 18 2018, Derrick Stolee wrote: > On 12/18/2018 9:22 AM, Thomas Ferris Nicolaisen wrote: >> Hey there, > > Hi, Thomas! > >> Accidentally, my first use-case was a local copy of a big repository >> (chromium source) that another developer had cloned shallow (I wasn't >> even aware of th

Re: Merge behavior with merge.conflictStyle diff3

2018-12-18 Thread Jeff King
On Tue, Dec 18, 2018 at 03:34:20PM -0200, Adilson de Almeida Junior wrote: > I guess, most times the second behavior is the expected: two conflict > hunks, not only the divvergent pieces (this case, the second line) of > them. By the doc: > > merge.conflictStyle > > Specify the style in whic

SEND PRICES

2018-12-18 Thread JUDE SUPPLY
-- Attention:Sir/Madam Please can you furnish me in full details about the standard of your products, I will appreciate it more if you can give me with detail specification. I am working as an accredited commission agent and I am looking for supplier whose products is of good quality as your

Re: [PATCH v2] Simplify handling of setup_git_directory_gently() failure cases.

2018-12-18 Thread Jeff King
On Sat, Dec 15, 2018 at 05:05:08PM -0800, Erin Dahlgren wrote: > setup_git_directory_gently() expects two types of failures to > discover a git directory (e.g. .git/): > [...] When I read your subject line, I'll admit to having a funny feeling in the pit of my stomach. This setup code has histori

Re: [PATCH v4 0/3] Add commit-graph fuzzer and fix buffer overflow

2018-12-18 Thread Jeff King
On Thu, Dec 13, 2018 at 11:43:55AM -0800, Josh Steadmon wrote: > Add a new fuzz test for the commit graph and fix a buffer read-overflow > that it discovered. Additionally, fix the Makefile instructions for > building fuzzers. > > Changes since V3: > * Improve portability of the new test functi

Merge behavior with merge.conflictStyle diff3

2018-12-18 Thread Adilson de Almeida Junior
Hi, I´m not sure if this is a bug or not. These are the steps to reproduce it (git 2.17 at least): - In a repo, with default settings (merge strategy, conflict style, merge drivers, etc); - Create a file 'test.xml', and add the following content to it: [div] A [/div] - Perform a git add and g

Re: [PATCH v3 0/3]

2018-12-18 Thread Jeff King
On Sun, Dec 16, 2018 at 01:57:56PM -0800, nbelakov...@gmail.com wrote: > Finally got around to submitting latest changes. > > I think this addresses all the feedback > > The atom now returns the worktree path instead of '+' Thanks, I think patch 1 is definitely going in the right direction. The

Re: [PATCH v3 1/3] ref-filter: add worktreepath atom

2018-12-18 Thread Jeff King
On Sun, Dec 16, 2018 at 01:57:57PM -0800, nbelakov...@gmail.com wrote: > From: Nickolai Belakovski > > Add an atom proving the path of the linked worktree where this ref is > checked out, if it is checked out in any linked worktrees, and empty > string otherwise. I stumbled over the word "provi

Re: [PATCH] log: add %S option (like --source) to log --format

2018-12-18 Thread Issac Trotts
Hi Peff, thanks for the feedback. I tried a variant of the command you showed and it yielded a seg fault: ``` [ issactrotts ~/git ] ./git diff-tree -s --pretty=tformat:'%S %H %s' HEAD Segmentation fault: 11 ``` I'll see if I can track it down this evening. Issac On Mon, Dec 17, 2018 at 7:59 AM Je

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-18 Thread Tejun Heo
Hey, guys. On Tue, Dec 18, 2018 at 08:48:35AM -0800, Stefan Xenos wrote: > I've just uploaded a new evolve proposal that includes a spec for the > "hiddenmetas" namespace, where we can store historical cherry-pick > information. Total noob question - where can I read that? Also, as long as I can

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-18 Thread Stefan Xenos
I've just uploaded a new evolve proposal that includes a spec for the "hiddenmetas" namespace, where we can store historical cherry-pick information. On Tue, Dec 18, 2018 at 6:40 AM Stefan Xenos wrote: > > Heya, Tejun! > > Thanks for getting in touch. I agree with Junio that we probably > shouldn

[PATCH v3] technical doc: add a design doc for the evolve command

2018-12-18 Thread sxenos
From: Stefan Xenos This document describes what a change graph for git would look like, the behavior of the evolve command, and the changes planned for other commands. Signed-off-by: Stefan Xenos --- Documentation/technical/evolve.txt | 1034 1 file changed, 1034 i

Re: Can git tell me which uncommitted files clash with the incoming changes?

2018-12-18 Thread Elijah Newren
On Tue, Dec 18, 2018 at 5:14 AM Jeff King wrote: > > On Mon, Dec 17, 2018 at 05:50:31PM -0500, Mark Kharitonov wrote: > > > Guys, having git merge --dry-run would be great, but I am OK with git > > merge for real as long as its output is parseable. Don't rely on that. merge output has changed oc

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-18 Thread Stefan Xenos
Heya, Tejun! Thanks for getting in touch. I agree with Junio that we probably shouldn't be tracking the same information in two ways if we can think of something that does both... so let's see if we can think of something! The evolve proposal suggests having a metas/ namespace to track ongoing cha

Re: commit-graph idea: warn when disabled for incompatible repositories

2018-12-18 Thread Derrick Stolee
On 12/18/2018 9:22 AM, Thomas Ferris Nicolaisen wrote: Hey there, Hi, Thomas! Accidentally, my first use-case was a local copy of a big repository (chromium source) that another developer had cloned shallow (I wasn't even aware of their clone being shallow at that point). After spending a li

commit-graph idea: warn when disabled for incompatible repositories

2018-12-18 Thread Thomas Ferris Nicolaisen
Hey there, I recently started dabbling with commit-graph. Accidentally, my first use-case was a local copy of a big repository (chromium source) that another developer had cloned shallow (I wasn't even aware of their clone being shallow at that point). After spending a little time trying to figu

Git hooks don't run while commiting in worktree via git-gui

2018-12-18 Thread Иван Могиш
Hello. There is a little difference in behavior when you are committing to the worktree from CLI or some git client (tortoisegit/sourcetree) and embedded git gui. If you configure git hooks in your repository and then add a worktree (via git worktree add), hooks from main repository works well bot

Re: Can git tell me which uncommitted files clash with the incoming changes?

2018-12-18 Thread Jeff King
On Mon, Dec 17, 2018 at 05:50:31PM -0500, Mark Kharitonov wrote: > Guys, having git merge --dry-run would be great, but I am OK with git > merge for real as long as its output is parseable. > > However, somewhere in between git 2.18 and git 2.20 the output of > merge changed and now I do not know

Re: [PATCH v2 8/8] tests: mark tests broken under GIT_TEST_PROTOCOL_VERSION=2

2018-12-18 Thread Ævar Arnfjörð Bjarmason
On Tue, Dec 18 2018, Jeff King wrote: > On Mon, Dec 17, 2018 at 03:14:52PM -0800, Jonathan Nieder wrote: > >> > IMHO those security guarantees there are overrated (due to delta >> > guessing attacks, though things are not quite as bad if the attacker >> > can't actually push to the repo). >> >>

Re: [PATCH v3 0/4] protocol v2 fixes

2018-12-18 Thread Jeff King
On Mon, Dec 17, 2018 at 11:40:50PM +0100, Ævar Arnfjörð Bjarmason wrote: > No changes to Jeff's patches since v2, for Jonathan's no changes to > the C code, but I added a test which I extracted from the > GIT_TEST_PROTOCOL_VERSION=2 work. > > Jeff King (3): > serve: pass "config context" throug

Re: [PATCH 1/3] serve: pass "config context" through to individual commands

2018-12-18 Thread Jeff King
On Sun, Dec 16, 2018 at 08:12:03PM +0900, Junio C Hamano wrote: > Jeff King writes: > > > Yeah, I agree that such a "pass this through" struct full of options and > > context would make sense. I just wouldn't tie it to the "serve" > > machinery. > > > > Did you read the side-thread between me an

Re: [PATCH v2 8/8] tests: mark tests broken under GIT_TEST_PROTOCOL_VERSION=2

2018-12-18 Thread Jeff King
On Tue, Dec 18, 2018 at 10:28:27AM +0100, Ævar Arnfjörð Bjarmason wrote: > I.e. have a repo with "master" and a "root-password" branch, where the > "root-password" branch has content that's irresistible to "git repack" > for delta purposes, do we end up sending the "root-password" content > over o

Re: [PATCH v2 8/8] tests: mark tests broken under GIT_TEST_PROTOCOL_VERSION=2

2018-12-18 Thread Jeff King
On Mon, Dec 17, 2018 at 03:14:52PM -0800, Jonathan Nieder wrote: > > IMHO those security guarantees there are overrated (due to delta > > guessing attacks, though things are not quite as bad if the attacker > > can't actually push to the repo). > > Do you have a proof of concept for delta guessin

Re: [PATCH v2] Simplify handling of setup_git_directory_gently() failure cases.

2018-12-18 Thread Johannes Schindelin
Hi Erin, On Sat, 15 Dec 2018, Erin Dahlgren wrote: > diff --git a/setup.c b/setup.c > index 1be5037..e1a9e17 100644 > --- a/setup.c > +++ b/setup.c > @@ -831,16 +831,6 @@ static const char *setup_bare_git_dir(struct strbuf > *cwd, int offset, > return NULL; > } > > -static const char *s

[no subject]

2018-12-18 Thread Shaye Lynne Haver
Hi dear My names are Lieutenant Shaye Lynne Haver, of the United States Military Officer, presently in Libya, I wrote eailier later to you, but no get any response from you, i have an important issue to discuss with you Please, reply me, for more discussion. Best regards Lt. Shaye

Re: [PATCH] stripspace: allow -s/-c outside git repository

2018-12-18 Thread Johannes Schindelin
Hi Martin, On Tue, 18 Dec 2018, Martin Ågren wrote: > On Mon, 17 Dec 2018 at 22:56, Jonathan Nieder wrote: > > That makes experimenting with the stripspace command unnecessarily > > fussy. Fix it by discovering the git directory gently, as intended > > all along. > > > if (mode == STRI

Re: [PATCH] stripspace: allow -s/-c outside git repository

2018-12-18 Thread Johannes Schindelin
Hi Jonathan, On Mon, 17 Dec 2018, Jonathan Nieder wrote: > v2.11.0-rc3~3^2~1 (stripspace: respect repository config, 2016-11-21) > improved stripspace --strip-comments / --comentlines by teaching them > to read repository config, but it went a little too far: when running > stripspace outside any

[PATCH 2/2] pack-redundant: remove unused functions

2018-12-18 Thread Jiang Xin
From: Sun Chao Remove unused functions to find `min` packs, such as `get_permutations`, `pll_free`, etc. Signed-off-by: Sun Chao Signed-off-by: Jiang Xin --- builtin/pack-redundant.c | 81 1 file changed, 81 deletions(-) diff --git a/builtin/pack-redu

[PATCH 1/2] pack-redundant: new algorithm to find min packs

2018-12-18 Thread Jiang Xin
From: Sun Chao When calling `git pack-redundant --all`, if there are too many local packs and too many redundant objects within them, the too deep iteration of `get_permutations` will exhaust all the resources, and the process of `git pack-redundant` will be killed. The following script could cr

Re: [PATCH v2 8/8] tests: mark tests broken under GIT_TEST_PROTOCOL_VERSION=2

2018-12-18 Thread Ævar Arnfjörð Bjarmason
On Tue, Dec 18 2018, Jonathan Nieder wrote: > Ævar Arnfjörð Bjarmason wrote: >> On Mon, Dec 17 2018, Jonathan Nieder wrote: > >>> This would make per-branch ACLs (as implemented both by Gerrit and >>> gitolite) an essentially useless feature, so please no. >> >> Doesn't Gerrit always use JGit? >