Your email box account needs to be upgraded now

2018-10-23 Thread Suomu, Anu
EMAIL UPGRADE NOTIFICATION Your email box account needs to be upgraded now to our latest version of Microsoft Outlook Account For better performance. If not Upgraded your email box account will be suspended now. Microsoft Verification Team Microsoft outlook

Votre compte de boîte aux lettres doit maintenant être mis à niveau

2018-10-23 Thread Suomu, Anu
NOTIFICATION DE MISE À NIVEAU DE COURRIEL Votre compte de boîte aux lettres doit maintenant être mis à niveau vers notre dernière version du compte Microsoft Outlook pour de meilleures performances. Si non mis à niveau, votre compte de boîte aux lettres sera

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Johannes Schindelin
Hi Ævar, On Tue, 23 Oct 2018, Ævar Arnfjörð Bjarmason wrote: > On Tue, Oct 23 2018, Johannes Schindelin wrote: > > > On Mon, 22 Oct 2018, Ævar Arnfjörð Bjarmason wrote: > > > >> So I think the only reason to keep it [GETTEXT_POISON] compile-time is > >> performance, but I don't think that

[PATCH] test: avoid failures when USE_NED_ALLOCATOR

2018-10-23 Thread Carlo Marcelo Arenas Belón
contrib/nedmalloc doesn't support MALLOC_CHECK_ or MALLOC_PERTURB_ so add it to the same exception that is being used with valgrind Signed-off-by: Carlo Marcelo Arenas Belón --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index

Re: [PATCH v2 3/3] rebase (autostash): use an explicit OID to apply the stash

2018-10-23 Thread Johannes Schindelin
Hi, On Tue, 23 Oct 2018, Junio C Hamano wrote: > SZEDER Gábor writes: > > >> To prevent that from happening, let's append `^0` after the stash hash, > >> to make sure that it is interpreted as an OID rather than as a number. > > > > Oh, this is clever. > > Yeah, we can do this as we know we'd

[PATCH 0/1] Load system libraries the recommended way on Windows

2018-10-23 Thread Johannes Schindelin via GitGitGadget
The search order for DLLs on Windows is a bit funny, and for system libraries, it is recommended to use a strict search path. In practice, this should not make a difference, as the library has been loaded into memory already, and therefore the LoadLibrary() call would just return the handle

Re: [PATCH 2/2] mingw: fix getcwd when the parent directory cannot be queried

2018-10-23 Thread Stephen Smith
On Tuesday, October 23, 2018 6:16:43 AM MST Stephen Smith wrote: > On Tuesday, October 23, 2018 3:52:49 AM MST you wrote: > > From: Anton Serbulov > > > > `GetLongPathName()` function may fail when it is unable to query > > the parent directory of a path component to determine the long name > >

[PATCH] khash: silence -Wunused-function

2018-10-23 Thread Carlo Marcelo Arenas Belón
after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) macro generated code should use a similar solution than commit-slab to silence the compiler. Signed-off-by: Carlo Marcelo Arenas Belón --- khash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH 2/2] mingw: fix getcwd when the parent directory cannot be queried

2018-10-23 Thread Stephen & Linda Smith
On Tuesday, October 23, 2018 3:52:49 AM MST you wrote: > From: Anton Serbulov > > `GetLongPathName()` function may fail when it is unable to query > the parent directory of a path component to determine the long name > for that component. It happens, because of it uses `FindFirstFile()` s/of

Re: New semantic patches vs. in-flight topics [was: Re: [PATCH 00/19] Bring more repository handles into our code base]

2018-10-23 Thread Junio C Hamano
Junio C Hamano writes: > I actually think this round does a far nicer job playing well with > other topics than any earlier series. The pain you are observing I > think come primarily from my not making the best use of these > patches. > > Steppng back a bit, I'd imagine in an ideal world where

RE: [PATCH v3 1/3] reset: don't compute unstaged changes after reset when --quiet

2018-10-23 Thread Johannes Schindelin
Hi Ben, On Mon, 22 Oct 2018, Ben Peart wrote: > > From: Johannes Schindelin > > > > On Mon, 22 Oct 2018, Ben Peart wrote: > > > > > When git reset is run with the --quiet flag, don't bother finding > > > any additional unstaged changes as they won't be output anyway. > > > This speeds up the

Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 17 2018, Jeff King wrote: > On Wed, Oct 17, 2018 at 02:19:59PM -0400, Eric Sunshine wrote: > >> On Wed, Oct 17, 2018 at 12:40 PM Ben Peart wrote: >> > Add a reset.quietDefault config setting that sets the default value of the >> > --quiet flag when running the reset command. This

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Johannes Schindelin wrote: > Hi Ævar, > > On Mon, 22 Oct 2018, Ævar Arnfjörð Bjarmason wrote: > >> So I think the only reason to keep it [GETTEXT_POISON] compile-time is >> performance, but I don't think that matters. It's not like we're >> printing gigabytes of _()

Re: [PATCH v3 0/3] repack -ad: fix after fetch --prune in a shallow repository

2018-10-23 Thread Johannes Schindelin
Hi, On Mon, 22 Oct 2018, Johannes Schindelin via GitGitGadget wrote: > Under certain circumstances, commits that were reachable can be made > unreachable, e.g. via git fetch --prune. These commits might have been > packed already, in which case git repack -adlf will just drop them without >

[PATCH v2] compat: make sure git_mmap is not expected to write

2018-10-23 Thread Carlo Marcelo Arenas Belón
in f48000fc ("Yank writing-back support from gitfakemmap.", 2005-10-08) support for writting back changes was removed but the specific prot flag that would be used was not checked for Acked-by: Johannes Schindelin Signed-off-by: Carlo Marcelo Arenas Belón --- Changes in v2: * reset-author

[PATCH 0/2] Work around case-insensitivity issues with cwd on Windows

2018-10-23 Thread Johannes Schindelin via GitGitGadget
On Windows, file names are recorded case-sensitively, but looked up case-insensitively. Therefore, it is possible to switch to a directory by using incorrect case, e.g. cd documentation will still get you into the Documentation subdirectory. In Powershell, doing so will however report the

[PATCH 1/1] mingw: load system libraries the recommended way

2018-10-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When we access IPv6-related functions, we load the corresponding system library using the `LoadLibrary()` function, which is not the recommended way to load system libraries. In practice, it does not make a difference: the `ws2_32.dll` library containing the IPv6

[PATCH 1/2] mingw: ensure `getcwd()` reports the correct case

2018-10-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When switching the current working directory, say, in PowerShell, it is quite possible to use a different capitalization than the one that is recorded on disk. While doing the same in `cmd.exe` adjusts the capitalization magically, that does not happen in PowerShell so

Failed stash caused untracked changes to be lost

2018-10-23 Thread Quinn, David
Issue: While running a git stash command including the '-u' flag to include untracked files, the command failed due to arguments in the incorrect order. After this untracked files the were present had been removed and permanently lost. Environment: Windows 10, Powershell w/ PoshGit State

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Johannes Schindelin
Hi Ævar, On Mon, 22 Oct 2018, Ævar Arnfjörð Bjarmason wrote: > So I think the only reason to keep it [GETTEXT_POISON] compile-time is > performance, but I don't think that matters. It's not like we're > printing gigabytes of _() formatted output. Everything where formatting > matters is plumbing

Re: [PATCH] compat: make sure git_mmap is not expected to write

2018-10-23 Thread Johannes Schindelin
Hi carlo, your mail's "From:" line does not record your full name, but the Signed-off-by: line does. Let's use the latter? On Mon, 22 Oct 2018, carlo wrote: > in f48000fc ("Yank writing-back support from gitfakemmap.", 2005-10-08) > support for writting back changes was removed but the specific

Re: New semantic patches vs. in-flight topics [was: Re: [PATCH 00/19] Bring more repository handles into our code base]

2018-10-23 Thread Carlo Arenas
On Tue, Oct 23, 2018 at 2:40 AM Junio C Hamano wrote: > > The tip of 'pu' has trouble with -Wunused on Apple around the > delta-islands series. FWIW the "problem" is actually with -Wunused-function and is AFAIK not related to the semantic changes or Apple (AKA macOS) Indeed, I saw this issue

[PATCH 2/2] mingw: fix getcwd when the parent directory cannot be queried

2018-10-23 Thread Anton Serbulov via GitGitGadget
From: Anton Serbulov `GetLongPathName()` function may fail when it is unable to query the parent directory of a path component to determine the long name for that component. It happens, because of it uses `FindFirstFile()` function for each next short part of path. The `FindFirstFile()` requires

[PATCH 0/3] Use nanosecond-precision file times on Windows

2018-10-23 Thread Johannes Schindelin via GitGitGadget
This is yet another patch series in the slow wave of patches coming over from Git for Windows. With this change, we now use preciser timestamps to determine e.g. whether the Git index is out of date. This change made it into Git for Windows already in version 2.6.0, i.e. for a little over three

[PATCH 1/3] mingw: factor out code to set stat() data

2018-10-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In our fstat() emulation, we convert the file metadata from Win32 data structures to an emulated POSIX structure. To structure the code better, let's factor that part out into its own function. Note: it would be tempting to try to unify this code with the part of

[PATCH 2/3] mingw: replace MSVCRT's fstat() with a Win32-based implementation

2018-10-23 Thread Karsten Blees via GitGitGadget
From: Karsten Blees fstat() is the only stat-related CRT function for which we don't have a full replacement yet (and thus the only reason to stick with MSVCRT's 'struct stat' definition). Fully implement fstat(), in preparation of implementing a POSIX 2013 compatible 'struct stat' with

[PATCH 3/3] mingw: implement nanosecond-precision file times

2018-10-23 Thread Karsten Blees via GitGitGadget
From: Karsten Blees We no longer use any of MSVCRT's stat-functions, so there's no need to stick to a CRT-compatible 'struct stat' either. Define and use our own POSIX-2013-compatible 'struct stat' with nanosecond- precision file times. Note: This can cause performance issues when using Git

Re: New semantic patches vs. in-flight topics [was: Re: [PATCH 00/19] Bring more repository handles into our code base]

2018-10-23 Thread Junio C Hamano
Carlo Arenas writes: > On Tue, Oct 23, 2018 at 2:40 AM Junio C Hamano wrote: >> >> The tip of 'pu' has trouble with -Wunused on Apple around the >> delta-islands series. > > FWIW the "problem" is actually with -Wunused-function and is AFAIK not > related to the semantic changes or Apple (AKA

Re: [PATCH] range-diff: allow to diff files regardless submodule

2018-10-23 Thread Lucas De Marchi
On Thu, Oct 11, 2018 at 05:25:02PM +0900, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > On Wed, Oct 10 2018, Lucas De Marchi wrote: > > > >> Do like it's done in grep so mode doesn't end up as > >> 016, which means range-diff doesn't work if one has > >> "submodule.diff =

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Duy Nguyen
On Tue, Oct 23, 2018 at 12:17 PM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Oct 23 2018, Johannes Schindelin wrote: > > > Hi Ævar, > > > > On Mon, 22 Oct 2018, Ævar Arnfjörð Bjarmason wrote: > > > >> So I think the only reason to keep it [GETTEXT_POISON] compile-time is > >> performance, but I

Re: [PATCH 7/8] gettext: introduce GIT_GETTEXT_POISON=scrambled

2018-10-23 Thread Duy Nguyen
On Mon, Oct 22, 2018 at 10:23 PM SZEDER Gábor wrote: > [TODO: Fallout? >A 'printf(_("foo: %s"), var);' call includes the contents of >'var' unscrambled in the output. Could that hide the >translation of a string that should not have been translated? >I'm afraid

Re: [PATCH v4 7/7] t6012: make rev-list tests more interesting

2018-10-23 Thread Jakub Narebski
"Derrick Stolee via GitGitGadget" writes: > From: Derrick Stolee > > As we are working to rewrite some of the revision-walk machinery, > there could easily be some interesting interactions between the > options that force topological constraints (--topo-order, > --date-order, and

Re: [PATCH] khash: silence -Wunused-function

2018-10-23 Thread René Scharfe
Am 23.10.2018 um 13:34 schrieb Carlo Marcelo Arenas Belón: > after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) > macro generated code should use a similar solution than commit-slab to > silence the compiler. With Clang 6 and GCC 8 on Debian I don't get any warnings on

[PATCH/RFC v2 1/1] Use off_t instead of size_t for functions dealing with streamed checkin

2018-10-23 Thread tboegi
From: Torsten Bögershausen When streaming data from disk into a blob, it should be possible to commit a file with a file size > 4 GiB using the streaming functionality in Git. Because of the streaming there is no need to load the whole data into memory at once. Today this is not possible on e.g.

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Duy Nguyen
On Mon, Oct 22, 2018 at 10:23 PM SZEDER Gábor wrote: > Once upon a time a GETTEXT_POISON build job failed on me, and the > error message: > > error: # GETTEXT POISON # > > was not particularly useful. Ook wouldn't help with that... Oook? > So I came up with the following couple of patches

Re: [PATCH] khash: silence -Wunused-function

2018-10-23 Thread Duy Nguyen
On Tue, Oct 23, 2018 at 1:42 PM Carlo Marcelo Arenas Belón wrote: > > after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) > macro generated code should use a similar solution than commit-slab to > silence the compiler. > > Signed-off-by: Carlo Marcelo Arenas Belón > --- >

Re: [PATCH v3 1/3] reset: don't compute unstaged changes after reset when --quiet

2018-10-23 Thread Duy Nguyen
On Tue, Oct 23, 2018 at 1:01 AM Ben Peart wrote: > > > -Original Message- > > From: Johannes Schindelin > > Sent: Monday, October 22, 2018 4:45 PM > > To: Ben Peart > > Cc: git@vger.kernel.org; gits...@pobox.com; Ben Peart > > ; p...@peff.net; sunsh...@sunshineco.com > > Subject: Re:

[PATCH 1/3] [Outreachy] t3903-stash: test without configured user name

2018-10-23 Thread Slavica
This is part of enhancement request that ask for `git stash` to work even if `user.name` is not configured. The issue is discussed here: https://public-inbox.org/git/87o9debty4@evledraar.gmail.com/T/#u. Signed-off-by: Slavica --- t/t3903-stash.sh | 17 + 1 file changed, 17

Re: [PATCH v4 6/7] revision.c: generation-based topo-order algorithm

2018-10-23 Thread Derrick Stolee
On 10/22/2018 9:37 AM, Jakub Narebski wrote: "Derrick Stolee via GitGitGadget" writes: From: Derrick Stolee The current --topo-order algorithm requires walking all reachable commits up front, topo-sorting them, all before outputting the first value. This patch introduces a new algorithm

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Duy Nguyen wrote: > On Tue, Oct 23, 2018 at 12:17 PM Ævar Arnfjörð Bjarmason > wrote: >> >> >> On Tue, Oct 23 2018, Johannes Schindelin wrote: >> >> > Hi Ævar, >> > >> > On Mon, 22 Oct 2018, Ævar Arnfjörð Bjarmason wrote: >> > >> >> So I think the only reason to keep it

Re: [PATCH] khash: silence -Wunused-function

2018-10-23 Thread Carlo Arenas
On Tue, Oct 23, 2018 at 9:19 AM René Scharfe wrote: > With Clang 6 and GCC 8 on Debian I don't get any warnings on master or > 36da893114. I see it with Clang 7 on Fedora (at least Rawhide but suspect also to affect the next release, now in beta: 29) > With Clang 6 on OpenBSD I get warnings

Re: [PATCH v2 3/3] rebase (autostash): use an explicit OID to apply the stash

2018-10-23 Thread Alban Gruin
Hi Johannes, this looks good to me, too! Cheers, Alban

Re: [PATCH v3 3/3] reset: warn when refresh_index() takes more than 2 seconds

2018-10-23 Thread Ben Peart
On 10/22/2018 8:23 PM, Junio C Hamano wrote: Ben Peart writes: From: Ben Peart refresh_index() is done after a reset command as an optimization. Because it can be an expensive call, warn the user if it takes more than 2 seconds and tell them how to avoid it using the --quiet command

Re: [PATCH v3 2/3] reset: add new reset.quiet config setting

2018-10-23 Thread Ben Peart
On 10/22/2018 4:06 PM, Jeff King wrote: On Mon, Oct 22, 2018 at 08:13:32PM +0100, Ramsay Jones wrote: -q:: --quiet:: - Be quiet, only report errors. +--no-quiet:: + Be quiet, only report errors. The default behavior respects the + `reset.quiet` config option, or

Re: New semantic patches vs. in-flight topics [was: Re: [PATCH 00/19] Bring more repository handles into our code base]

2018-10-23 Thread Stefan Beller
On Tue, Oct 23, 2018 at 2:38 AM Junio C Hamano wrote: > > Junio C Hamano writes: > > > I actually think this round does a far nicer job playing well with > > other topics than any earlier series. The pain you are observing I > > think come primarily from my not making the best use of these > >

Re: [RFC 2/2] exclude-promisor-objects: declare when option is allowed

2018-10-23 Thread Matthew DeVore
On Tue, 23 Oct 2018, Junio C Hamano wrote: Not really. We were already doing a controlled failure via die(), so these two tests would not have caught the problem in the code before the fix in this patch. BUG is apparently considered a "wrong" failure and not a controlled one by

Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting

2018-10-23 Thread Ben Peart
On 10/23/2018 5:13 AM, Ævar Arnfjörð Bjarmason wrote: On Wed, Oct 17 2018, Jeff King wrote: On Wed, Oct 17, 2018 at 02:19:59PM -0400, Eric Sunshine wrote: On Wed, Oct 17, 2018 at 12:40 PM Ben Peart wrote: Add a reset.quietDefault config setting that sets the default value of the

Re: [PATCH 7/9] submodule: fetch in submodules git directory instead of in worktree

2018-10-23 Thread Stefan Beller
On Wed, Oct 17, 2018 at 3:58 PM Jonathan Tan wrote: > > > This patch started as a refactoring to make 'get_next_submodule' more > > readable, but upon doing so, I realized that "git fetch" of the submodule > > actually doesn't need to be run in the submodules worktree. So let's run > > it in its

Re: [PATCH v3 2/3] reset: add new reset.quiet config setting

2018-10-23 Thread Ben Peart
On 10/22/2018 10:45 AM, Duy Nguyen wrote: On Mon, Oct 22, 2018 at 3:38 PM Ben Peart wrote: From: Ben Peart Add a reset.quiet config setting that sets the default value of the --quiet flag when running the reset command. This enables users to change the default behavior to take advantage

Re: [PATCH 1/3] [Outreachy] t3903-stash: test without configured user name

2018-10-23 Thread Christian Couder
On Tue, Oct 23, 2018 at 6:35 PM Slavica wrote: > > This is part of enhancement request that ask for `git stash` to work even if > `user.name` is not configured. > The issue is discussed here: > https://public-inbox.org/git/87o9debty4@evledraar.gmail.com/T/#u. We prefer commit messages that

[PATCH v4 2/3] reset: add new reset.quiet config setting

2018-10-23 Thread Ben Peart
From: Ben Peart Add a reset.quiet config setting that sets the default value of the --quiet flag when running the reset command. This enables users to change the default behavior to take advantage of the performance advantages of avoiding the scan for unstaged changes after reset. Defaults to

[PATCH v4 0/3] speed up git reset

2018-10-23 Thread Ben Peart
From: Ben Peart Updated the wording in the documentation and commit messages to (hopefully) make it clearer. Added the warning about 'reset --quiet' to the advice system so that it can be turned off. Base Ref: Web-Diff: https://github.com/benpeart/git/commit/8a2fef45d4 Checkout: git fetch

[PATCH v4 1/3] reset: don't compute unstaged changes after reset when --quiet

2018-10-23 Thread Ben Peart
From: Ben Peart When git reset is run with the --quiet flag, don't bother finding any additional unstaged changes as they won't be output anyway. This speeds up the git reset command by avoiding having to lstat() every file looking for changes that aren't going to be reported anyway. The

[PATCH v4 3/3] reset: warn when refresh_index() takes more than 2 seconds

2018-10-23 Thread Ben Peart
From: Ben Peart refresh_index() is done after a reset command as an optimization. Because it can be an expensive call, warn the user if it takes more than 2 seconds and tell them how to avoid it using the --quiet command line option or reset.quiet config setting. Signed-off-by: Ben Peart ---

Re: [PATCH v1] load_cache_entries_threaded: remove unused src_offset parameter

2018-10-23 Thread Ben Peart
On 10/22/2018 7:05 PM, Junio C Hamano wrote: Jeff King writes: If nobody uses it, should we drop the return value, too? Like: Yup. I'm good with that. At one point I also had the additional #ifndef NO_PTHREADS lines but it was starting to get messy with the threaded vs non-threaded

[PATCH] Clear --exclude list after 'git rev-parse --all'

2018-10-23 Thread Andreas Gruenbacher
Commit [1] added the --exclude option to revision.c. The --all, --branches, --tags, --remotes, and --glob options clear the exclude list. Shortly therafter, commit [2] added the same to 'git rev-parse', but without clearing the exclude list for the --all option. Fix that. [1] e7b432c52

Re: [PATCH 1/3] [Outreachy] t3903-stash: test without configured user name

2018-10-23 Thread Eric Sunshine
On Tue, Oct 23, 2018 at 12:31 PM Slavica wrote: > This is part of enhancement request that ask for `git stash` to work even if > `user.name` is not configured. > The issue is discussed here: > https://public-inbox.org/git/87o9debty4@evledraar.gmail.com/T/#u. As Christian mentioned already,

Re: [PATCH v3 1/3] reset: don't compute unstaged changes after reset when --quiet

2018-10-23 Thread Johannes Schindelin
Hi Duy, On Tue, 23 Oct 2018, Duy Nguyen wrote: > On Tue, Oct 23, 2018 at 1:01 AM Ben Peart wrote: > > > > > -Original Message- > > > From: Johannes Schindelin > > > Sent: Monday, October 22, 2018 4:45 PM > > > To: Ben Peart > > > Cc: git@vger.kernel.org; gits...@pobox.com; Ben Peart >

[PATCH 2/2] rebase --autostash: fix issue with dirty submodules

2018-10-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Since we cannot stash dirty submodules, there is no use in requiring them to be clean (or stash them when they are not). This brings the built-in rebase in line with the previous, scripted version, which also did not care about dirty submodules (but it was admittedly

[PATCH 0/2] Demonstrate and fix a rebase --autostash bug with dirty submodules

2018-10-23 Thread Johannes Schindelin via GitGitGadget
This bug report came in via Git for Windows (already with version 2.19.0, but I misread the reporter's enthusiasm to take matters into his own hands). The culprit is, in a nutshell, that the built-in rebase tries to run git stash only when the worktree is dirty, but it includes submodules in

[PATCH 1/2] rebase --autostash: demonstrate a problem with dirty submodules

2018-10-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It has been reported that dirty submodules cause problems with the built-in rebase when it is asked to autostash. The symptom is: fatal: Unexpected stash response: '' This patch adds a regression test that demonstrates that bug. Original report:

Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting

2018-10-23 Thread Jeff King
On Tue, Oct 23, 2018 at 02:11:01PM -0400, Ben Peart wrote: > This sounds like an easy way to choose a set of default values that we think > make sense to get bundled together. That could be a way for users to quickly > choose a set of good defaults but I still think you would want find grained >

Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Ben Peart wrote: > On 10/23/2018 5:13 AM, Ævar Arnfjörð Bjarmason wrote: >> >> On Wed, Oct 17 2018, Jeff King wrote: >> >>> On Wed, Oct 17, 2018 at 02:19:59PM -0400, Eric Sunshine wrote: >>> On Wed, Oct 17, 2018 at 12:40 PM Ben Peart wrote: > Add a

Re: [PATCH v1] load_cache_entries_threaded: remove unused src_offset parameter

2018-10-23 Thread Jeff King
On Tue, Oct 23, 2018 at 03:13:06PM -0400, Ben Peart wrote: > At one point I also had the additional #ifndef NO_PTHREADS lines but it was > starting to get messy with the threaded vs non-threaded code paths so I > removed them. I'm fine with which ever people find more readable. > > It does make

Re: [RFC 0/2] explicitly support or not support --exclude-promisor-objects

2018-10-23 Thread Matthew DeVore
On Tue, 23 Oct 2018, Junio C Hamano wrote: Thanks; both patches make sense. As the problematic feature appeared in 2.17.x track, I'll see if I can easily make it ready to be merged down to maint-2.17 track later when somebody wants to. Great. Thank you for the review.

Re: [PATCH v3 2/3] reset: add new reset.quiet config setting

2018-10-23 Thread Jeff King
On Tue, Oct 23, 2018 at 01:31:58PM -0400, Ben Peart wrote: > On 10/22/2018 4:06 PM, Jeff King wrote: > > On Mon, Oct 22, 2018 at 08:13:32PM +0100, Ramsay Jones wrote: > > > > > > -q:: > > > > --quiet:: > > > > - Be quiet, only report errors. > > > > +--no-quiet:: > > > > + Be

Re: [PATCH 7/9] submodule: fetch in submodules git directory instead of in worktree

2018-10-23 Thread Stefan Beller
On Tue, Oct 23, 2018 at 3:55 PM Jonathan Tan wrote: > > When adding the comment here, we'd also want to have > > the comment in prepare_submodule_repo_env, which > > could be its own preparation commit. > > I agree with the protection. As for the preparation commit, I don't > think it's always

[PATCH v2 1/2] commit-slabs: move MAYBE_UNUSED out

2018-10-23 Thread Carlo Marcelo Arenas Belón
after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) it is expected to be used to prevent -Wunused-function warnings for code that was macro generated Signed-off-by: Carlo Marcelo Arenas Belón --- commit-slab-impl.h | 4 ++-- git-compat-util.h | 2 ++ 2 files changed, 4

[PATCH v2 2/2] khash: silence -Wunused-function for delta-islands

2018-10-23 Thread Carlo Marcelo Arenas Belón
showing the following when compiled with latest clang (OpenBSD, Fedors and macOS): delta-islands.c:23:1: warning: unused function 'kh_destroy_str' [-Wunused-function] delta-islands.c:23:1: warning: unused function 'kh_clear_str' [-Wunused-function] delta-islands.c:23:1: warning:

[PATCH v2 0/2] delta-islands: avoid unused function messages

2018-10-23 Thread Carlo Marcelo Arenas Belón
the macro generated code from delta-islands (using khash) triggers some unused function warnings in macOS, OpenBSD and some linux with a newer version of clang Carlo Marcelo Arenas Belón (2): commit-slabs: move MAYBE_UNUSED out khash: silence -Wunused-function for delta-islands

Re: git pull defaults for recursesubmodules

2018-10-23 Thread Stefan Beller
On Tue, Oct 23, 2018 at 2:04 PM Tommi Vainikainen wrote: > > I configured my local git to fetch with recurseSubmodules = on-demand, > which I found the most convenient setting. However then I noticed that > I mostly use git pull actually to fetch from remotes, but git pull > does not utilize any

Re: [PATCH v2 1/2] commit-slabs: move MAYBE_UNUSED out

2018-10-23 Thread Carlo Arenas
On Tue, Oct 23, 2018 at 3:00 PM Jeff King wrote: > On Tue, Oct 23, 2018 at 02:50:19PM -0700, Carlo Marcelo Arenas Belón wrote: > > #define implement_static_commit_slab(slabname, elemtype) \ > > - implement_commit_slab(slabname, elemtype, static MAYBE_UNUSED) > > +

Re: [PATCH/RFC] thread-utils: better wrapper to avoid #ifdef NO_PTHREADS

2018-10-23 Thread Jeff King
On Thu, Oct 18, 2018 at 08:05:22PM +0200, Nguyễn Thái Ngọc Duy wrote: > On Thu, Oct 18, 2018 at 7:09 PM Jeff King wrote: > > > In this particular case though I think we should be able to avoid so > > > much #if if we make a wrapper for pthread api that would return an > > > error or something

Re: [PATCH] commit-reach: fix sorting commits by generation

2018-10-23 Thread Thomas Gummerer
On 10/22, René Scharfe wrote: > Am 22.10.2018 um 23:10 schrieb Thomas Gummerer: > > compare_commit_by_gen is used to sort a list of pointers to 'struct > > commit'. The comparison function for qsort is called with pointers to > > the objects it needs to compare, so when sorting a list of 'struct

[PATCH] i18n: make GETTEXT_POISON a runtime option

2018-10-23 Thread Ævar Arnfjörð Bjarmason
Change the GETTEXT_POISON compile-time + runtime GIT_GETTEXT_POISON test parameter to only be a GIT_TEST_GETTEXT_POISON= runtime parameter, to be consistent with other parameters documented in "Running tests with special setups" in t/README. When I added GETTEXT_POISON in bb946bba76 ("i18n: add

git pull defaults for recursesubmodules

2018-10-23 Thread Tommi Vainikainen
I configured my local git to fetch with recurseSubmodules = on-demand, which I found the most convenient setting. However then I noticed that I mostly use git pull actually to fetch from remotes, but git pull does not utilize any recurseSubmoddules setting now, or at least I could not find such.

Re: [PATCH v2 1/2] commit-slabs: move MAYBE_UNUSED out

2018-10-23 Thread Jeff King
On Tue, Oct 23, 2018 at 02:50:19PM -0700, Carlo Marcelo Arenas Belón wrote: > after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18) > it is expected to be used to prevent -Wunused-function warnings for code > that was macro generated Makes sense. > diff --git

Re: [PATCH 7/9] submodule: fetch in submodules git directory instead of in worktree

2018-10-23 Thread Jonathan Tan
> > Why does GIT_DIR need to be set? Is it to avoid subcommands recursively > > checking the parent directories in case the CWD is a malformed Git > > repository? If yes, maybe it's worth adding a comment. > > It is copying the structure from prepare_submodule_repo_env, > specifically 10f5c52656

Re: [PATCH 1/3] gpg-interface.c: use flags to determine key/signer info presence

2018-10-23 Thread brian m. carlson
On Mon, Oct 22, 2018 at 06:38:19PM +0200, Michał Górny wrote: > Replace the logic used to determine whether key and signer information > is present to use explicit flags in sigcheck_gpg_status[] array. This > is more future-proof, since it makes it possible to add additional > statuses without

Re: git pull defaults for recursesubmodules

2018-10-23 Thread brian m. carlson
On Wed, Oct 24, 2018 at 12:04:06AM +0300, Tommi Vainikainen wrote: > I configured my local git to fetch with recurseSubmodules = on-demand, > which I found the most convenient setting. However then I noticed that > I mostly use git pull actually to fetch from remotes, but git pull > does not

[PATCH] revision.c: drop missing objects from cmdline

2018-10-23 Thread Matthew DeVore
No code which reads cmdline in struct rev_info can handle NULL objects in cmdline.rev[i].item, so stop adding them to the cmdline.rev array. Objects in cmdline are NULL when the given object is promisor and --exclude-promisor-objects is enabled. This new behavior avoids a segmentation fault in

Re: [PATCH 8/9] fetch: retry fetching submodules if needed objects were not fetched

2018-10-23 Thread Stefan Beller
On Wed, Oct 17, 2018 at 5:40 PM Jonathan Tan wrote: > > > Currently when git-fetch is asked to recurse into submodules, it dispatches > > a plain "git-fetch -C " (with some submodule related options > > such as prefix and recusing strategy, but) without any information of the > > remote or the

[PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

2018-10-23 Thread Denton Liu
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the `merge.guitool` variable to find the default mergetool instead of `merge.tool`. Signed-off-by: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David

Re: [PATCH/RFC] thread-utils: better wrapper to avoid #ifdef NO_PTHREADS

2018-10-23 Thread Junio C Hamano
Jeff King writes: > I also think we may want to make a fundamental shift in our view of > thread support. In the early days, it was "well, this is a thing that > modern systems can take advantage of for certain commands". But these > days I suspect it is more like "there are a handful of legacy

Re: [PATCH 2/3] mingw: replace MSVCRT's fstat() with a Win32-based implementation

2018-10-23 Thread brian m. carlson
On Tue, Oct 23, 2018 at 03:23:21AM -0700, Karsten Blees via GitGitGadget wrote: > - if (!get_file_info_by_handle(fh, buf)) > + case FILE_TYPE_CHAR: > + case FILE_TYPE_PIPE: > + /* initialize stat fields */ > + memset(buf, 0, sizeof(*buf)); > +

Re: Add config option to make "--keep-index" the default for "git stash push"

2018-10-23 Thread brian m. carlson
On Mon, Oct 22, 2018 at 10:11:50AM +0200, Ralf Jung wrote: > Hi all, > > I have been repeatedly bitten by the default behavior of `git stash` to stash > not just the unstaged but also the staged changes, and then `git stash pop` > making all changes unstaged. This means `git stash && git stash

Re: [PATCH] range-diff: allow to diff files regardless submodule

2018-10-23 Thread Junio C Hamano
Lucas De Marchi writes: >> Yes, I agree on both counts (i.e. it was totally unclear what >> problem is being solved and what the root cause of the problem is, >> and we would want a new test to protect this "fix" from getting >> broken in the future. > > have you seen I sent a v2 with proper

Re: [PATCH 8/9] fetch: retry fetching submodules if needed objects were not fetched

2018-10-23 Thread Jonathan Tan
> > Another thing you need to clarify is what happens if the fetch-by-commit > > fails. Right now, it seems that it will make the whole thing fail, which > > might be a surprising change in behavior. > > But a positive surprise, I would assume? Whether positive or negative, I think that this

Re: [PATCH 1/3] [Outreachy] t3903-stash: test without configured user name

2018-10-23 Thread Junio C Hamano
Slavica writes: > +test_expect_failure 'stash with HOME as non-existing directory' ' > +test_commit 1 && > +test_config user.useconfigonly true && > +test_config stash.usebuiltin true && > +( > +HOME=$(pwd)/none && > +export HOME && What is the reason why this

[PATCH 2/2] completion: Support `git mergetool --[no-]gui`

2018-10-23 Thread Denton Liu
Signed-off-by: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David Lu Signed-off-by: Ryan Wang --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

Re: [PATCH v3 2/3] reset: add new reset.quiet config setting

2018-10-23 Thread Junio C Hamano
Ben Peart writes: >>> diff --git a/Documentation/config.txt b/Documentation/config.txt >>> index f6f4c21a54..a2d1b8b116 100644 >>> --- a/Documentation/config.txt >>> +++ b/Documentation/config.txt >>> @@ -2728,6 +2728,9 @@ rerere.enabled:: >>> `$GIT_DIR`, e.g. if "rerere" was previously

Re: [PATCH] test: avoid failures when USE_NED_ALLOCATOR

2018-10-23 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > contrib/nedmalloc doesn't support MALLOC_CHECK_ or MALLOC_PERTURB_ > so add it to the same exception that is being used with valgrind > > Signed-off-by: Carlo Marcelo Arenas Belón > --- > t/test-lib.sh | 2 +- > 1 file changed, 1 insertion(+), 1

Re: [PATCH 1/3] gpg-interface.c: use flags to determine key/signer info presence

2018-10-23 Thread Junio C Hamano
"brian m. carlson" writes: > On Mon, Oct 22, 2018 at 06:38:19PM +0200, Michał Górny wrote: >> Replace the logic used to determine whether key and signer information >> is present to use explicit flags in sigcheck_gpg_status[] array. This >> is more future-proof, since it makes it possible to

Re: [PATCH v4 2/3] reset: add new reset.quiet config setting

2018-10-23 Thread Ramsay Jones
On 23/10/2018 20:04, Ben Peart wrote: > From: Ben Peart Sorry for the late reply, ... I've been away from email - I am still trying to catch up. > > Add a reset.quiet config setting that sets the default value of the --quiet > flag when running the reset command. This enables users to

Re: [RFC 2/2] exclude-promisor-objects: declare when option is allowed

2018-10-23 Thread Junio C Hamano
Matthew DeVore writes: > On Tue, 23 Oct 2018, Junio C Hamano wrote: > >> Not really. We were already doing a controlled failure via die(), >> so these two tests would not have caught the problem in the code >> before the fix in this patch. >> > > BUG is apparently considered a "wrong" failure

Re: [PATCH] range-diff: allow to diff files regardless submodule

2018-10-23 Thread Lucas De Marchi
On Wed, Oct 24, 2018 at 11:12:51AM +0900, Junio C Hamano wrote: > Lucas De Marchi writes: > > >> Yes, I agree on both counts (i.e. it was totally unclear what > >> problem is being solved and what the root cause of the problem is, > >> and we would want a new test to protect this "fix" from

Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

2018-10-23 Thread Junio C Hamano
Denton Liu writes: > Subject: Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments Other people may point it out, but s/Accept/accept/. > In line with how difftool accepts a -g/--[no-]gui option, make mergetool > accept the same option in order to use the `merge.guitool` variable to >

Re: [PATCH] i18n: make GETTEXT_POISON a runtime option

2018-10-23 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Notes on the implementation: > > * The only reason we need a new "git-sh-i18n--helper" and the >corresponding "test-tool gettext-poison" is to expose >git_env_bool() to shellscripts, since git-sh-i18n and friends need >to inspect the

[PATCH v2 1/2] mergetool: accept -g/--[no-]gui as arguments

2018-10-23 Thread Denton Liu
In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the `merge.guitool` variable to find the default mergetool instead of `merge.tool`. Signed-off-by: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David

[PATCH v2 2/2] completion: support `git mergetool --[no-]gui`

2018-10-23 Thread Denton Liu
Signed-off-by: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David Lu Signed-off-by: Ryan Wang --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

  1   2   >