Re: [PATCH v3 1/7] rebase: fix incompatible options error message

2018-11-28 Thread Duy Nguyen
On Thu, Nov 22, 2018 at 7:32 PM Elijah Newren wrote: > > In commit f57696802c30 ("rebase: really just passthru the `git am` > options", 2018-11-14), the handling of `git am` options was simplified > dramatically (and an option parsing bug was fixed), but it introduced > a small regression in the

Re: [PATCH v3 1/7] rebase: fix incompatible options error message

2018-11-28 Thread Elijah Newren
On Wed, Nov 28, 2018 at 12:28 AM Johannes Schindelin wrote: > > Hi Elijah, > > On Wed, 21 Nov 2018, Elijah Newren wrote: > > > In commit f57696802c30 ("rebase: really just passthru the `git am` > > options", 2018-11-14), the handling of `git am` options was simplified > > dramatically (and an

Re: [PATCH v2 7/7] Suggest other commands instead of "git checkout"

2018-11-28 Thread Duy Nguyen
On Wed, Nov 28, 2018 at 7:04 AM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > The assumption made is here > > > > - "git checkout" is a horrible monster that should only be touched > > with a two-meter pole > > > > - there are other commands that can achieve the same thing > >

Re: [PATCH v2 6/7] checkout: split into switch-branch and checkout-files

2018-11-28 Thread Duy Nguyen
On Wed, Nov 28, 2018 at 7:03 AM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > The good old "git checkout" command is still here and will be until > > all (or most of users) are sick of it. > > Two comments on the goal (the implementation looked reasonable > assuming the reader

Dear I Need An Investment Partner

2018-11-28 Thread Aisha Gaddafi
-- Hello Dear , I came across your contact during my private search Mrs Aisha Al-Qaddafi is my name, the only daughter of late Libyan president, I have funds the sum of $27.5 million USD for investment, I am interested in you for investment project assistance in your country, i shall compensate

git@vger.kernel.org has been hacked! Change your password immediately!

2018-11-28 Thread kassie
Hello! I have very bad news for you. 03/08/2018 - on this day I hacked your OS and got full access to your account git@vger.kernel.org On this day your account git@vger.kernel.org has password: dirgantara So, you can change the password, yes.. But my malware intercepts it every time. How I

Re: [PATCH v2 1/7] parse-options: allow parse_options_concat(NULL, options)

2018-11-28 Thread Duy Nguyen
On Tue, Nov 27, 2018 at 8:44 PM Stefan Beller wrote: > > On Tue, Nov 27, 2018 at 8:53 AM Nguyễn Thái Ngọc Duy > wrote: > > > > There is currently no caller that calls this function with "a" being > > NULL. But it will be introduced shortly. It is used to construct the > > option array from

Re: [PATCH] rebase -i: introduce the 'test' command

2018-11-28 Thread Johannes Schindelin
Hi Paul, On Wed, 28 Nov 2018, Paul Morelle wrote: > The 'exec' command can be used to run tests on a set of commits, > interrupting on failing commits to let the user fix the tests. > > However, the 'exec' line has been consumed, so it won't be ran again by > 'git rebase --continue' is ran,

Re: [PATCH] t5562: skip if NO_CURL is enabled

2018-11-28 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 22 2018, Jeff King wrote: > On Thu, Nov 22, 2018 at 02:17:01AM -0800, Carlo Arenas wrote: >> PS. upstreaming the PERL_PATH fix is likely to be good to do soonish >> as I presume at least all BSD might be affected, let me know if you >> would rather me do that instead as I suspect we

[bug report] git-gui child windows are blank

2018-11-28 Thread Kenn Sebesta
v2.19.2, installed from brew on macOS Mojave 14.2.1. `git-gui` is my much beloved go-to tool for everything git. Unfortunately, on my new Macbook Air it seems to have a bug. When I first load the program, the parent window populates normally with the stage/unstaged and diff panes. However, when I

[PATCH] rebase -i: introduce the 'test' command

2018-11-28 Thread Paul Morelle
The 'exec' command can be used to run tests on a set of commits, interrupting on failing commits to let the user fix the tests. However, the 'exec' line has been consumed, so it won't be ran again by 'git rebase --continue' is ran, even if the tests weren't fixed. This commit introduces a new

Re: [PATCH v1] teach git to support a virtual (partially populated) work directory

2018-11-28 Thread SZEDER Gábor
On Tue, Nov 27, 2018 at 02:50:57PM -0500, Ben Peart wrote: > diff --git a/t/t1092-virtualworkdir.sh b/t/t1092-virtualworkdir.sh > new file mode 100755 > index 00..0cdfe9b362 > --- /dev/null > +++ b/t/t1092-virtualworkdir.sh > @@ -0,0 +1,393 @@ > +#!/bin/sh > + > +test_description='virtual

Re: [PATCH] t5562: skip if NO_CURL is enabled

2018-11-28 Thread SZEDER Gábor
On Tue, Nov 20, 2018 at 04:11:08AM -0500, Jeff King wrote: > On Mon, Nov 19, 2018 at 11:36:08AM -0800, Carlo Arenas wrote: > > > tests 3-8 seem to fail because perl is hardcoded to /urs/bin/perl in > > t5562/invoke-with-content-length.pl, while I seem to be getting some > > sporadic errors in 9

Re: [PATCH v2] log -G: Ignore binary files

2018-11-28 Thread Ævar Arnfjörð Bjarmason
On Wed, Nov 28 2018, Thomas Braun wrote: Looks much better this time around. > The -G option of log looks for the differences whose patch text > contains added/removed lines that match regex. > > As the concept of patch text only makes sense for text files, we need to > ignore binary files

Re: [PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-28 Thread Ævar Arnfjörð Bjarmason
On Wed, Nov 28 2018, Johannes Schindelin wrote: > Hi Jonathan, > > On Tue, 27 Nov 2018, Jonathan Nieder wrote: > >> At https://bugs.debian.org/914695 is a report of a test regression in >> an outside project that is very likely to have been triggered by the >> new faster rebase code. > > From

Re: Broken alignment in git-reset docs

2018-11-28 Thread Martin Ågren
On Wed, 28 Nov 2018 at 12:42, Paweł Samoraj wrote: > > Hi! > The git-reset documentation page section which is accessible via URL > https://git-scm.com/docs/git-reset#_discussion is not looking good. > [snip] > > The web archive has got a snapshot from 2014-06-28 when it was ok >

Broken alignment in git-reset docs

2018-11-28 Thread Paweł Samoraj
Hi! The git-reset documentation page section which is accessible via URL https://git-scm.com/docs/git-reset#_discussion is not looking good. ASCII tables should look like this: working index HEAD target working index HEAD

[PATCH v2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
The -G option of log looks for the differences whose patch text contains added/removed lines that match regex. As the concept of patch text only makes sense for text files, we need to ignore binary files when searching with -G as well. The -S option of log looks for differences that changes the

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 11:16 > geschrieben: [...] > > > > +test_expect_success 'log -G ignores binary files' ' > > + rm -rf .git && > > + git init && > > + printf "a\0b" >data.bin && > > + git add data.bin && > > + git commit -m "message" && > > + git

Re: [PATCH v1 2/2] log -S: Add test which searches in binary files

2018-11-28 Thread Thomas Braun
> Junio C Hamano hat am 22. November 2018 um 02:34 > geschrieben: > > > Thomas Braun writes: > > > The -S option of log looks for differences that changes the > > number of occurrences of the specified string (i.e. addition/deletion) > > in a file. > > s/-S /-S/ and > s/the specified

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Junio C Hamano hat am 27. November 2018 um 01:51 > geschrieben: > > > Stefan Beller writes: > > > On Wed, Nov 21, 2018 at 1:08 PM Thomas Braun > > wrote: > >> > >> The -G option of log looks for the differences whose patch text > >> contains added/removed lines that match regex. > >> >

Re: [PATCH v1 2/2] log -S: Add test which searches in binary files

2018-11-28 Thread Thomas Braun
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 10:14 > geschrieben: > > > > On Wed, Nov 21 2018, Thomas Braun wrote: > > > The -S option of log looks for differences that changes the > > number of occurrences of the specified string (i.e. addition/deletion) > > in a file. > > > > Add

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Ævar Arnfjörð Bjarmason hat am 22. November 2018 um 11:16 > geschrieben: [...] > > > > +test_expect_success 'log -G ignores binary files' ' > > + rm -rf .git && > > + git init && > > + printf "a\0b" >data.bin && > > + git add data.bin && > > + git commit -m "message" && > > + git

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Jeff King hat am 22. November 2018 um 17:20 geschrieben: > > > On Wed, Nov 21, 2018 at 09:52:27PM +0100, Thomas Braun wrote: > > > diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c > > index 69fc55ea1e..8c2558b07d 100644 > > --- a/diffcore-pickaxe.c > > +++ b/diffcore-pickaxe.c > > @@

Re: [PATCH v1 1/2] log -G: Ignore binary files

2018-11-28 Thread Thomas Braun
> Junio C Hamano hat am 22. November 2018 um 02:29 > geschrieben: > > > Thomas Braun writes: > > > The -G option of log looks for the differences whose patch text > > contains added/removed lines that match regex. > > > > The concept of differences only makes sense for text files, therefore

Re: in 2.19.2 t0061-run-command FAILs if . is in $PATH

2018-11-28 Thread Johannes Schindelin
Hi, On Wed, 28 Nov 2018, H.Merijn Brand wrote: > the test is explicitely checking that it should not find runnable > scripts outside $PATH, *assuming* $PATH does not have . in it Does this fix it for you? -- snip -- diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh index

Re: [PATCH v1] mem_pool: add GIT_TRACE_MEMPOOL support

2018-11-28 Thread Johannes Schindelin
Hi Ben, On Tue, 27 Nov 2018, Ben Peart wrote: > From: Ben Peart > > Add tracing around initializing and discarding mempools. In discard report > on the amount of memory unused in the current block to help tune setting > the initial_size. > > Signed-off-by: Ben Peart > --- Looks good. My

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-28 Thread Johannes Schindelin
Hi J.H. On Wed, 28 Nov 2018, Houder wrote: > On 2018-11-28 09:46, Johannes Schindelin wrote: > > > > On Wed, 28 Nov 2018, J.H. van de Water wrote: > > > > > > > me@work /cygdrive > > > > > $ ls > > > > > c d > > > > > > > > > > So `/cygdrive` *is* a valid directory in Cygwin. > > > > > > > >

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-28 Thread Johannes Schindelin
Hi Junio, On Wed, 28 Nov 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > ... > > In short, even a thorough study of the code (keeping in mind the few > > tidbits of information provided by you) leaves me really wondering which > > code you run, because it sure does not look

Re: [PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-28 Thread Johannes Schindelin
Hi Jonathan, On Tue, 27 Nov 2018, Jonathan Nieder wrote: > At https://bugs.debian.org/914695 is a report of a test regression in > an outside project that is very likely to have been triggered by the > new faster rebase code. >From looking through that log.gz (without having a clue where the

in 2.19.2 t0061-run-command FAILs if . is in $PATH

2018-11-28 Thread H.Merijn Brand
the test is explicitely checking that it should not find runnable scripts outside $PATH, *assuming* $PATH does not have . in it Having '.' in $PATH can be seen as a bad idea (and it most likely is), but the tests should either remove '.' from $PATH before testing or ignore that fail if $PATH does

Re: [PATCH] advice: don't pointlessly suggest --convert-graft-file

2018-11-28 Thread Johannes Schindelin
Hi Ævar, On Tue, 27 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > The advice to run 'git replace --convert-graft-file' added in > f9f99b3f7d ("Deprecate support for .git/info/grafts", 2018-04-29) > didn't add an exception for the 'git replace --convert-graft-file' > codepath itself. > > As a

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-28 Thread Houder
On 2018-11-28 09:46, Johannes Schindelin wrote: Hi J.H., On Wed, 28 Nov 2018, J.H. van de Water wrote: > > me@work /cygdrive > > $ ls > > c d > > > > So `/cygdrive` *is* a valid directory in Cygwin. > > That supports the code that does not special case a path that begins > with /cygdrive/

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-28 Thread Johannes Schindelin
Hi J.H., On Wed, 28 Nov 2018, J.H. van de Water wrote: > > > me@work /cygdrive > > > $ ls > > > c d > > > > > > So `/cygdrive` *is* a valid directory in Cygwin. > > > > That supports the code that does not special case a path that begins > > with /cygdrive/ and simply treats it as a full path

Re: [PATCH v3 1/7] rebase: fix incompatible options error message

2018-11-28 Thread Johannes Schindelin
Hi Elijah, On Wed, 21 Nov 2018, Elijah Newren wrote: > In commit f57696802c30 ("rebase: really just passthru the `git am` > options", 2018-11-14), the handling of `git am` options was simplified > dramatically (and an option parsing bug was fixed), but it introduced > a small regression in the

Re: [PATCH] tests: avoid syntax triggering old dash bug

2018-11-27 Thread Torsten Bögershausen
On Wed, Nov 28, 2018 at 01:47:41AM +, brian m. carlson wrote: > On Tue, Nov 27, 2018 at 05:42:53PM +0100, Ævar Arnfjörð Bjarmason wrote: > > Avoid a bug in dash that's been fixed ever since its > > ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first > > released with dash

Re: [RFC PATCH] Introduce "precious" file concept

2018-11-27 Thread Per Lundberg
On 11/28/18 3:21 AM, brian m. carlson wrote: Thanks for the elaboration, Brian - good to get things down to a practical, real-world level. > [...] > > I point this out to underscore how fundamental this change is. People > overwhelmingly do not read the release notes, so expecting people to

Re: [PATCH] advice: don't pointlessly suggest --convert-graft-file

2018-11-27 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > The advice to run 'git replace --convert-graft-file' added in > f9f99b3f7d ("Deprecate support for .git/info/grafts", 2018-04-29) > didn't add an exception for the 'git replace --convert-graft-file' > codepath itself. > > As a result we'd suggest running

Re: Git pull confusing output

2018-11-27 Thread Junio C Hamano
Will writes: > I’m far from being a guru, but I consider myself a competent Git > user. Yet, here’s my understanding of the output of one the most-used > commands, `git push`: >> Counting objects: 6, done. > No idea what an “object” is. Apparently there’s 6 of them > here. What does “counting”

Re: [PATCH v2 7/7] Suggest other commands instead of "git checkout"

2018-11-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The assumption made is here > > - "git checkout" is a horrible monster that should only be touched > with a two-meter pole > > - there are other commands that can achieve the same thing Thanks for clearly spelling out the assumptions. It is good that this step

Re: [PATCH v2 6/7] checkout: split into switch-branch and checkout-files

2018-11-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The good old "git checkout" command is still here and will be until > all (or most of users) are sick of it. Two comments on the goal (the implementation looked reasonable assuming the reader agrees with the gaol). At least to me, the verb "switch" needs two

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-27 Thread J.H. van de Water
> > me@work /cygdrive > > $ ls > > c d > > > > So `/cygdrive` *is* a valid directory in Cygwin. > > That supports the code that does not special case a path that begins > with /cygdrive/ and simply treats it as a full path and freely use > relative path, I guess. Very good point. Please read

Re: [PATCH v2 1/7] parse-options: allow parse_options_concat(NULL, options)

2018-11-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > There is currently no caller that calls this function with "a" being > NULL. But it will be introduced shortly. It is used to construct the > option array from scratch, e.g. > >struct parse_options opts = NULL; Missing asterisk somewhere? >opts =

Re: [PATCH] tests: avoid syntax triggering old dash bug

2018-11-27 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, Nov 27, 2018 at 11:43 AM Ævar Arnfjörð Bjarmason > wrote: >> Avoid a bug in dash that's been fixed ever since its >> ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first >> released with dash v0.5.7 in July 2011. > > Perhaps enhance the commit

Re: [PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-27 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: >> Ævar Arnfjörð Bjarmason writes: >>> Given that we're still finding regressions bugs in the rebase-in-C >>> version should we be considering reverting 5541bd5b8f ("rebase: default >>> to using the builtin rebase", 2018-08-08)? >>> >>> I love the feature, but fear

Re: [PATCH] t5562: do not reuse output files

2018-11-27 Thread Max Kirillov
On Mon, Nov 26, 2018 at 11:06:40AM +0900, Junio C Hamano wrote: > I am offhand not sure what the right value of wait_after_clean for > this codepath be, though. 46df6906 ("execv_dashed_external: wait > for child on signal death", 2017-01-06) made this non-default but > turned it on for dashed

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-27 Thread Junio C Hamano
Johannes Schindelin writes: > It takes a little folding and knotting of the brain to understand that > this `!skip_dos_drive_prefix()` has *nothing* to do with the comment > `unc paths` nor with the test whether the paths starts with two directory > separators. > > As a consequence, I would

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-27 Thread Junio C Hamano
Johannes Schindelin writes: >> Sorry, but I fail to see the point the last example wants to make. > > I agree. For me, the real test is this: > > me@work ~ > $ cd /cygdrive > > me@work /cygdrive > $ ls > c d > > So `/cygdrive` *is* a valid directory in Cygwin. That supports the code that does

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-27 Thread Junio C Hamano
Johannes Schindelin writes: > ... > In short, even a thorough study of the code (keeping in mind the few > tidbits of information provided by you) leaves me really wondering which > code you run, because it sure does not look like current `master` to me. > > And if it is not `master`, then I

Re: [RFC PATCH] Introduce "precious" file concept

2018-11-27 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > What do you think about some patch like that which retains the plumbing > behavior for things like read-tree, doesn't introduce "precious" or > "trashable", and just makes you specify "[checkout|merge|...] --force" > in cases where we'd have clobbering? Whether

Re: Forcing GC to always fail

2018-11-27 Thread Bryan Turner
On Tue, Nov 27, 2018 at 5:55 PM Elijah Newren wrote: > > On Tue, Nov 27, 2018 at 4:16 PM Ævar Arnfjörð Bjarmason > wrote: > > > > On Wed, Nov 28 2018, Bryan Turner wrote: > > > > > On Tue, Nov 27, 2018 at 3:47 PM Ævar Arnfjörð Bjarmason > > > wrote: > > >> > > >> On Tue, Nov 27 2018, Bryan

Re: Forcing GC to always fail

2018-11-27 Thread Elijah Newren
On Tue, Nov 27, 2018 at 4:16 PM Ævar Arnfjörð Bjarmason wrote: > > On Wed, Nov 28 2018, Bryan Turner wrote: > > > On Tue, Nov 27, 2018 at 3:47 PM Ævar Arnfjörð Bjarmason > > wrote: > >> > >> On Tue, Nov 27 2018, Bryan Turner wrote: > >> > >> > > >> > Is there anything I can set, perhaps some

Re: [PATCH] tests: avoid syntax triggering old dash bug

2018-11-27 Thread brian m. carlson
On Tue, Nov 27, 2018 at 05:42:53PM +0100, Ævar Arnfjörð Bjarmason wrote: > Avoid a bug in dash that's been fixed ever since its > ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first > released with dash v0.5.7 in July 2011. > > This fixes 1/2 tests failing on Debian Lenny &

Re: [RFC PATCH] Introduce "precious" file concept

2018-11-27 Thread brian m. carlson
On Tue, Nov 27, 2018 at 02:50:34PM +, Per Lundberg wrote: > I agree strongly with this personally; if we must choose between "might > break automation" and "might delete non-garbage files", I would say the > former is the lesser evil of the two. > > But, if I had 10 000 000 servers set up

Re: Forcing GC to always fail

2018-11-27 Thread Ævar Arnfjörð Bjarmason
On Wed, Nov 28 2018, Bryan Turner wrote: > On Tue, Nov 27, 2018 at 3:47 PM Ævar Arnfjörð Bjarmason > wrote: >> >> >> On Tue, Nov 27 2018, Bryan Turner wrote: >> >> > >> > Is there anything I can set, perhaps some invalid configuration >> > option/value, that will make "git gc" (most important)

Re: Forcing GC to always fail

2018-11-27 Thread Bryan Turner
On Tue, Nov 27, 2018 at 3:47 PM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Nov 27 2018, Bryan Turner wrote: > > > > > Is there anything I can set, perhaps some invalid configuration > > option/value, that will make "git gc" (most important) and "git > > reflog" (ideal, but less important) fail

Re: Forcing GC to always fail

2018-11-27 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 27 2018, Bryan Turner wrote: > Something of an odd question, but is there something I can do in the > configuration for a repository that forces any "git gc" run in that > repository to always fail without doing anything? (Ideally I'd like to > make "git reflog expire" _also_ fail.)

Re: [PATCH v11 20/22] stash: convert `stash--helper.c` into `stash.c`

2018-11-27 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 27 2018, Johannes Schindelin wrote: > Hi Junio & Paul, > > On Mon, 26 Nov 2018, Junio C Hamano wrote: > >> Paul-Sebastian Ungureanu writes: >> >> > The old shell script `git-stash.sh` was removed and replaced >> > entirely by `builtin/stash.c`. In order to do that, `create` and >>

Re: Git pull confusing output

2018-11-27 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 27 2018, Will wrote: > On 27 Nov 2018, at 19:24, Stefan Beller wrote: > >> The different phases taking each one line takes up precious >> screen real estate, so another approach would be delete the line >> after one phase is finished, such that you'd only see the currently >> active

[PATCH 3/5] t/README: re-flow a paragraph

2018-11-27 Thread Ævar Arnfjörð Bjarmason
An earlier change changed this paragraph to make the first line quite short as to produce a more minimal diff. Let's re-flow it. There's no changes here if diffed with --word-diff. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/README | 9 - 1 file changed, 4 insertions(+), 5 deletions(-)

[PATCH 2/5] t/README: modernize description of GIT_SKIP_TESTS

2018-11-27 Thread Ævar Arnfjörð Bjarmason
When the GIT_SKIP_TESTS documentation was added in fbd458a3f6 ("t/README: Add 'Skipping Tests' section below 'Running Tests'", 2008-06-20) there was no way to declare test prerequisites, that came later in a7bb394037 ("test-lib: Infrastructure to test and check for prerequisites", 2009-03-01).

[PATCH 5/5] test-lib: add support for GIT_TODO_TESTS

2018-11-27 Thread Ævar Arnfjörð Bjarmason
As noted in the updated t/README documentation being added here setting this new GIT_TODO_TESTS variable is usually better than GIT_SKIP_TESTS. My use-case for this is to get feedback from the CI infrastructure[1] about which tests are passing due to fixes that have trickled into git.git. With

[PATCH 1/5] t/README: make the 'Skipping tests' section less confusing

2018-11-27 Thread Ævar Arnfjörð Bjarmason
I added this section in b5500d16cd ("t/README: Add a section about skipping tests", 2010-07-02), but apparently didn't notice that there was an existing "Skipping Tests" section added in fbd458a3f6 ("t/README: Add 'Skipping Tests' section below 'Running Tests'", 2008-06-20). Then since 20873f45e7

[PATCH 4/5] test-lib: add more exhaustive GIT_SKIP_TESTS testing

2018-11-27 Thread Ævar Arnfjörð Bjarmason
Add a test for the when GIT_SKIP_TESTS is used to skip entire test files. Support for this was added back in 04ece59399 ("GIT_SKIP_TESTS: allow users to omit tests that are known to break", 2006-12-28), but never tested for. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t-basic.sh | 17

Re: Git pull confusing output

2018-11-27 Thread Will
On 27 Nov 2018, at 19:24, Stefan Beller wrote: > The different phases taking each one line takes up precious > screen real estate, so another approach would be delete the line > after one phase is finished, such that you'd only see the currently > active phase (that can be useful for debugging

Re: [PATCH v11 03/22] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`

2018-11-27 Thread Thomas Gummerer
On 11/27, Johannes Schindelin wrote: > Hi, > > On Sun, 25 Nov 2018, Thomas Gummerer wrote: > > > On 11/23, Paul-Sebastian Ungureanu wrote: > > > Implement `strbuf_insertf()` and `strbuf_vinsertf()` to > > > insert data using a printf format string. > > > > > > Original-idea-by: Johannes

Forcing GC to always fail

2018-11-27 Thread Bryan Turner
Something of an odd question, but is there something I can do in the configuration for a repository that forces any "git gc" run in that repository to always fail without doing anything? (Ideally I'd like to make "git reflog expire" _also_ fail.) Background: For Bitbucket Server, we have a fairly

Re: [PATCH v2 0/9] diff --color-moved-ws fixes and enhancment

2018-11-27 Thread Phillip Wood
Hi Stefan On 26/11/2018 21:20, Stefan Beller wrote: On Fri, Nov 23, 2018 at 3:17 AM Phillip Wood wrote: From: Phillip Wood Thanks to Stefan for his feedback on v1. I've updated patches 2 & 8 in response to those comments - see the range-diff below for details (the patch numbers are off by

Re: [PATCH 8/9] sha1-file: use loose object cache for quick existence check

2018-11-27 Thread René Scharfe
Am 12.11.2018 um 15:54 schrieb Jeff King: > diff --git a/sha1-file.c b/sha1-file.c > index 4aae716a37..e53da0b701 100644 > --- a/sha1-file.c > +++ b/sha1-file.c > @@ -921,6 +921,24 @@ static int open_sha1_file(struct repository *r, > return -1; > } > > +static int quick_has_loose(struct

git difftool --dir-diff not saving new files copied from LOCAL to REMOTE

2018-11-27 Thread Moon, John
Hi all, I’m using vim DirDiff plugin to compare 2 branches. This works great for the most part except: When I compare a branch to the current branch (git difftool -t vimDirDiff --dir-diff master) If there is a file that exists in $LOCAL that is not in $REMOTE I copy the file into $REMOTE,

[PATCH] advice: don't pointlessly suggest --convert-graft-file

2018-11-27 Thread Ævar Arnfjörð Bjarmason
The advice to run 'git replace --convert-graft-file' added in f9f99b3f7d ("Deprecate support for .git/info/grafts", 2018-04-29) didn't add an exception for the 'git replace --convert-graft-file' codepath itself. As a result we'd suggest running --convert-graft-file while the user was running

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-27 Thread Achim Gratz
Junio C Hamano writes: > I wonder if it makes the rest of the code simpler if we stripped > things like /cygdrive/c here exactly the sam way as we strip C: > For that, has_dos_drive_prefix() needs to know /cygdrive/[a-z], > which may not be a bad thing, I guess. Let's read on. The cygdrive

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-27 Thread Frank Schäfer
Am 27.11.18 um 19:15 schrieb Johannes Sixt: > Am 27.11.18 um 00:31 schrieb Junio C Hamano: >> Johannes Sixt writes: >>> Am 26.11.18 um 04:04 schrieb Junio C Hamano: >>> ... this goes too far, IMO. It is the pager's task to decode control >>> characters. >> >> It was tongue-in-cheek suggestion

Re: [PATCH v1/RFC 1/1] 'git clone C:\cygwin\home\USER\repo' is working (again)

2018-11-27 Thread Achim Gratz
tbo...@web.de writes: > The solution is to implement has_dos_drive_prefix(), skip_dos_drive_prefix() > is_dir_sep(), offset_1st_component() and convert_slashes() for cygwin > in the same way as it is done in 'Git for Windows' in compat/mingw.[ch] Please use the Cygwin API path conversion

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-27 Thread Frank Schäfer
Am 27.11.18 um 00:31 schrieb Junio C Hamano: > Johannes Sixt writes: > >> Am 26.11.18 um 04:04 schrieb Junio C Hamano: >>> That does not sound right. I would understand it if both lines >>> showed ^M at the end, and only the one on the postimage line had it >>> highlighted as a

[PATCH v1] mem_pool: add GIT_TRACE_MEMPOOL support

2018-11-27 Thread Ben Peart
From: Ben Peart Add tracing around initializing and discarding mempools. In discard report on the amount of memory unused in the current block to help tune setting the initial_size. Signed-off-by: Ben Peart --- Notes: Base Ref: * git-trace-mempool Web-Diff:

Re: [PATCH v2 4/7] checkout: move dwim_new_local_branch to checkout_opts

2018-11-27 Thread Stefan Beller
On Tue, Nov 27, 2018 at 8:53 AM Nguyễn Thái Ngọc Duy wrote: > > Signed-off-by: Nguyễn Thái Ngọc Duy I would not mind to have this squashed into the previous patch but keeping it separated is fine, too. (Reason for squashing: it makes it clearer that we do not care about one specific option, but

[PATCH v1] teach git to support a virtual (partially populated) work directory

2018-11-27 Thread Ben Peart
From: Ben Peart To make git perform well on the very largest repos, we must make git operations O(modified) instead of O(size of repo). This takes advantage of the fact that the number of files a developer has modified (especially in very large repos) is typically a tiny fraction of the overall

Re: [PATCH v2 3/7] checkout: move 'confict_style' to checkout_opts

2018-11-27 Thread Stefan Beller
On Tue, Nov 27, 2018 at 8:53 AM Nguyễn Thái Ngọc Duy wrote: > The last patches seemed self explanatory after the first RFC and their commit message. This one is harder to reason about, as --conflict is documented as "The same as --merge option above, but ..." and --merge is "When switching

Re: [PATCH v2 1/7] parse-options: allow parse_options_concat(NULL, options)

2018-11-27 Thread Stefan Beller
On Tue, Nov 27, 2018 at 8:53 AM Nguyễn Thái Ngọc Duy wrote: > > There is currently no caller that calls this function with "a" being > NULL. But it will be introduced shortly. It is used to construct the > option array from scratch, e.g. > >struct parse_options opts = NULL; >opts =

Re: [PATCH] tests: avoid syntax triggering old dash bug

2018-11-27 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 27 2018, Eric Sunshine wrote: > On Tue, Nov 27, 2018 at 11:43 AM Ævar Arnfjörð Bjarmason > wrote: >> Avoid a bug in dash that's been fixed ever since its >> ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first >> released with dash v0.5.7 in July 2011. > > Perhaps

Re: [PATCH] tests: avoid syntax triggering old dash bug

2018-11-27 Thread Eric Sunshine
On Tue, Nov 27, 2018 at 11:43 AM Ævar Arnfjörð Bjarmason wrote: > Avoid a bug in dash that's been fixed ever since its > ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first > released with dash v0.5.7 in July 2011. Perhaps enhance the commit message to explain the nature of the

Re: Git pull confusing output

2018-11-27 Thread Stefan Beller
On Tue, Nov 27, 2018 at 8:52 AM Will wrote: > And even them, do they need this info every time they push? I agree that we should make the output a bit more user friendly, which means we'd only want to output relevant data for the user. The different phases taking each one line takes up

Re: [PATCH] config.mak.dev: enable -Wpedantic in clang

2018-11-27 Thread Eric Sunshine
On Tue, Nov 27, 2018 at 10:48 AM Carlo Arenas wrote: > On Tue, Nov 27, 2018 at 2:53 AM Eric Sunshine wrote: > > On Tue, Nov 27, 2018 at 5:06 AM Carlo Marcelo Arenas Belón > > > +ifneq ($(filter clang10,$(COMPILER_FEATURES)),) > > > +CFLAGS += -Wpedantic > > > +endif > > > > Should this condition

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-27 Thread Johannes Sixt
Am 27.11.18 um 00:31 schrieb Junio C Hamano: Johannes Sixt writes: Am 26.11.18 um 04:04 schrieb Junio C Hamano: ... this goes too far, IMO. It is the pager's task to decode control characters. It was tongue-in-cheek suggestion to split a CR into caret-em on our end, but we'd get essentially

[PATCH v2 3/7] checkout: move 'confict_style' to checkout_opts

2018-11-27 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 31245c1eb4..211a347a0c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -55,6 +55,7 @@ struct

[PATCH v2 6/7] checkout: split into switch-branch and checkout-files

2018-11-27 Thread Nguyễn Thái Ngọc Duy
"git checkout" doing too many things is a source of confusion for many users (and it even bites old timers sometimes). To rememdy that, the command is now split in two: switch-branch and checkout-files. The switch-branch command is all about switching branches, detaching, DWIM-ing new branch...

[PATCH v2 5/7] checkout: split options[] array in three pieces

2018-11-27 Thread Nguyễn Thái Ngọc Duy
This is a preparation step for introducing new commands that do parts of what checkout does. There will be two new commands, one is about switching branches, detaching HEAD... one about checking out paths. These share the a subset of command line options. The rest of command line options are

[PATCH v2 2/7] checkout: make "opts" in cmd_checkout() a pointer

2018-11-27 Thread Nguyễn Thái Ngọc Duy
"opts" will soon be moved out of cmd_checkout(). To keep changes in that patch smaller, convert "opts" to a pointer and keep the real thing behind "real_opts". Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 109 +++-- 1 file changed, 55

[PATCH v2 1/7] parse-options: allow parse_options_concat(NULL, options)

2018-11-27 Thread Nguyễn Thái Ngọc Duy
There is currently no caller that calls this function with "a" being NULL. But it will be introduced shortly. It is used to construct the option array from scratch, e.g. struct parse_options opts = NULL; opts = parse_options_concat(opts, opts_1); opts = parse_options_concat(opts,

[PATCH/RFC v2 0/7] Introduce new commands switch-branch and checkout-files

2018-11-27 Thread Nguyễn Thái Ngọc Duy
v2 is just a bit better to look at than v1. This is by no means final. If you think the command name is bad, the default behavior should change, or something else, speak up. It's still very "RFC". v2 breaks down the giant patch in v1 and starts adding some changes in these new commands: -

[PATCH v2 7/7] Suggest other commands instead of "git checkout"

2018-11-27 Thread Nguyễn Thái Ngọc Duy
The assumption made is here - "git checkout" is a horrible monster that should only be touched with a two-meter pole - there are other commands that can achieve the same thing Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-branch.txt | 8 ++--

[PATCH v2 4/7] checkout: move dwim_new_local_branch to checkout_opts

2018-11-27 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 211a347a0c..a50c51f287 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -44,6 +44,8 @@ struct

Git pull confusing output

2018-11-27 Thread Will
I’m far from being a guru, but I consider myself a competent Git user. Yet, here’s my understanding of the output of one the most-used commands, `git push`: Counting objects: 6, done. No idea what an “object” is. Apparently there’s 6 of them here. What does “counting” them means? Should I

[PATCH] tests: avoid syntax triggering old dash bug

2018-11-27 Thread Ævar Arnfjörð Bjarmason
Avoid a bug in dash that's been fixed ever since its ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first released with dash v0.5.7 in July 2011. This fixes 1/2 tests failing on Debian Lenny & Squeeze. The other failure is due to 1b42f45255 ("git-svn: apply "svn.pathnameencoding"

Re: [PATCH] config.mak.dev: enable -Wpedantic in clang

2018-11-27 Thread Carlo Arenas
On Tue, Nov 27, 2018 at 2:53 AM Eric Sunshine wrote: > On Tue, Nov 27, 2018 at 5:06 AM Carlo Marcelo Arenas Belón > > +ifneq ($(filter clang10,$(COMPILER_FEATURES)),) > > +CFLAGS += -Wpedantic > > +endif > > Should this condition be tightened to match only for OSX since there > is no such clang

Re: [RFC PATCH] Introduce "precious" file concept

2018-11-27 Thread Duy Nguyen
On Tue, Nov 27, 2018 at 1:56 PM Jacob Keller wrote: > > On Tue, Nov 27, 2018 at 1:45 AM Per Lundberg wrote: > > > > On 11/26/18 5:55 PM, Duy Nguyen wrote: > > > On Mon, Nov 26, 2018 at 4:47 PM Ævar Arnfjörð Bjarmason > > > wrote: > > >> Some of the solutions overlap with this thing you want,

Re: [RFC PATCH] Introduce "precious" file concept

2018-11-27 Thread Ævar Arnfjörð Bjarmason
On Mon, Nov 26 2018, Junio C Hamano wrote: > Per Lundberg writes: > >> How about something like this: >> ... >> Would this be a reasonable compromise for everybody? > > I do not think you'd need to introduce such a deliberately breaking > change at all. Just introduce a new "precious" class,

Re: [RFC PATCH] Introduce "precious" file concept

2018-11-27 Thread Per Lundberg
On 11/27/18 2:55 PM, Jacob Keller wrote: > Personally, I would rather err on the side which requires the least > interaction from users to avoid silently clobbering an ignored file. > > [...] > > I don't like the idea of precious because it means people have to know > and remember to opt in,

GREAT ILLUMINATI SOCIETY

2018-11-27 Thread ILLUMINATE/BROTHERHOOD
The Illuminati operates in defense of you and all humans, in all places, and of all generations. Our duty to this planet has spanned across centuries and survived even the most established government entities. But the cultivation of trillions of human lives is a daunting responsibility, and

<    2   3   4   5   6   7   8   9   10   11   >