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

2018-10-22 Thread carlo
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) Signed-off-by: Carlo Marcelo Arenas Belón --- compat/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1

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

2018-10-22 Thread Junio C Hamano
Matthew DeVore writes: > t/t4202-log.sh | 4 > t/t8002-blame.sh | 4 > 7 files changed, 14 insertions(+), 1 deletion(-) > ... > diff --git a/t/t4202-log.sh b/t/t4202-log.sh > index 153a506151..819c24d10e 100755 > --- a/t/t4202-log.sh > +++ b/t/t4202-log.sh > @@ -1703,4

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

2018-10-22 Thread Junio C Hamano
Matthew DeVore writes: > This patch set fixes incorrect parsing of the --exclude-promisor-objects > option that I found while working on: > > https://public-inbox.org/git/cover.1539298957.git.matv...@google.com/ > Thanks; both patches make sense. As the problematic feature appeared in

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

2018-10-22 Thread Junio C Hamano
Stefan Beller writes: > Am I overestimating or misunderstanding rerere here? Yes. > Would it be realistic for next and master branch instead of pu? > > I'd be wary for the master branch, as we may not want to rely on > spatch without review. (It can produce funny white space issues, > but

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

2018-10-22 Thread Junio C Hamano
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 be dealing with a commit-ish. If we made a mistake to use a tree

Re: [PATCH v3] archive: initialize archivers earlier

2018-10-22 Thread Junio C Hamano
stead...@google.com writes: > diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh > index 2a97b27b0a..cfd5ca492f 100755 > --- a/t/t5000-tar-tree.sh > +++ b/t/t5000-tar-tree.sh > @@ -39,6 +39,8 @@ test_lazy_prereq TAR_NEEDS_PAX_FALLBACK ' > > test_lazy_prereq GZIP 'gzip --version' > >

Re: [PATCH 5/5] t7501: rename commit test to comply with naming convention

2018-10-22 Thread Eric Sunshine
On Mon, Oct 22, 2018 at 11:54 PM Stephen P. Smith wrote: > The naming convention was documented [1] but this script was not > renamed. > > The original commit message indicates the script tests basic commit > functionality. Clean up the test name by changing the file name to > specify the intent

Re: [PATCH 4/5] t7500: rename commit tests script to comply with naming convention

2018-10-22 Thread Eric Sunshine
On Mon, Oct 22, 2018 at 11:53 PM Stephen P. Smith wrote: > When the test naming convention was documented[1] the commit script > was not renamed. > > Update the test description to note that the tests fall into for > general categories: template, sign-off, -F and squash tests. s/for/four/ >

Re: [PATCH 2/5] t7509: cleanup description and filename

2018-10-22 Thread Eric Sunshine
On Mon, Oct 22, 2018 at 11:53 PM Stephen P. Smith wrote:> > Rename test and update the test description to explicitly state that > included tests all relate to commit authorship. The t7509-commit.sh > file was not rnemamed when other scripts were updated in compliance s/rnemamed/renamed/ > with

[PATCH 4/5] t7500: rename commit tests script to comply with naming convention

2018-10-22 Thread Stephen P. Smith
When the test naming convention was documented[1] the commit script was not renamed. Update the test description to note that the tests fall into for general categories: template, sign-off, -F and squash tests. Chose to not add "File" to the new script name as that did not seem to convey the

[PATCH 0/5] Commit test name clean-up

2018-10-22 Thread Stephen P. Smith
Several tests did not comply with the documented test naming standard. The patch series was held off until updates to t7501 was merged to the master branch. Stephen P. Smith (5): t2000: rename and combine checkout clash tests t7509: cleanup description and filename t7502: rename commit

[PATCH 1/5] t2000: rename and combine checkout clash tests

2018-10-22 Thread Stephen P. Smith
In an earlier patch some tests scripts were renamed and a naming convention was documented. [1] Merge t2000-checkout-cache-clash.sh and t2001-checkout-cache-clash.sh into t2000-conflict-when-checking-files-out.sh. [1] f50c9f76c ("Rename some test scripts and describe the naming convention",

[PATCH 2/5] t7509: cleanup description and filename

2018-10-22 Thread Stephen P. Smith
Rename test and update the test description to explicitly state that included tests all relate to commit authorship. The t7509-commit.sh file was not rnemamed when other scripts were updated in compliance with the test naming convention. [1] f50c9f76c ("Rename some test scripts and describe the

[PATCH 3/5] t7502: rename commit test script to comply with naming convention

2018-10-22 Thread Stephen P. Smith
When the test naming convention was documented[1] the commit script was not renamed. The test description for t7502 indicates that the test file is to contain porcelain type options for the commit command. The tests don't fall into a single category. There are tests for cleanup, sign-off,

[PATCH 5/5] t7501: rename commit test to comply with naming convention

2018-10-22 Thread Stephen P. Smith
The naming convention was documented [1] but this script was not renamed. The original commit message indicates the script tests basic commit functionality. Clean up the test name by changing the file name to specify the intent as documented in the initial commit. [1] f50c9f76c ("Rename some

[PATCH v3] send-email: explicitly disable authentication

2018-10-22 Thread Joshua Watt
It can be necessary to disable SMTP authentication by a mechanism other than sendemail.smtpuser being undefined. For example, if the user has sendemail.smtpuser set globally but wants to disable authentication locally in one repository. --smtp-auth and sendemail.smtpauth now understand the value

Re: [PATCH v2] send-email: explicitly disable authentication

2018-10-22 Thread Joshua Watt
On Mon, Oct 22, 2018 at 7:32 PM Junio C Hamano wrote: > > Joshua Watt writes: > > > It can be necessary to disable SMTP authentication by a mechanism other > > than sendemail.smtpuser being undefined. For example, if the user has > > sendemail.smtpuser set globally but wants to disable

[PATCH] Documentation/config.txt: fix typo in core.alternateRefsCommand

2018-10-22 Thread Taylor Blau
In [1] Git learned about 'core.alternateRefsCommand', and with it, the accompanying documentation. However, this documentation included a typo involving the verb tense of "produced". Match the tense of the surrounding bits by correcting this typo. [1]: 89284c1d6c (transport.c: introduce

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

2018-10-22 Thread Matthew DeVore
On Mon, 22 Oct 2018, Matthew DeVore wrote: This patch set fixes incorrect parsing of the --exclude-promisor-objects option that I found while working on: Somehow I sent two copies of every message in the patchset. I'm sorry for the mess.

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

2018-10-22 Thread Matthew DeVore
This patch set fixes incorrect parsing of the --exclude-promisor-objects option that I found while working on: https://public-inbox.org/git/cover.1539298957.git.matv...@google.com/ Thank you, Matthew DeVore (2): Documentation/git-log.txt: do not show --exclude-promisor-objects

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

2018-10-22 Thread Matthew DeVore
The --exclude-promisor-objects option causes some funny behavior in at least two commands: log and blame. It causes a BUG crash: $ git log --exclude-promisor-objects BUG: revision.c:2143: exclude_promisor_objects can only be used when fetch_if_missing is 0 Aborted

[RFC 1/2] Documentation/git-log.txt: do not show --exclude-promisor-objects

2018-10-22 Thread Matthew DeVore
Do not suggest that --exclude-promisor-objects is supported by git-log, since it currently BUG-crashes and it's not necessary to support it. Options that control behavior for promisor objects should be limited to a small number of commands. Signed-off-by: Matthew DeVore ---

Re: [PATCH v3 10/12] Add a base implementation of SHA-256 support

2018-10-22 Thread brian m. carlson
On Mon, Oct 22, 2018 at 11:44:40AM +0200, SZEDER Gábor wrote: > To protect us from potential "macro redefinition" errors, these > #undefs should come before the #defines above. Note also that BLKSIZE > is not #undef-ed. Ah, okay. I think I misread your suggestion. I'll see if anyone has more

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

2018-10-22 Thread Stefan Beller
> > similar to argv_array_pushl or would that be overengineered? > Am I missing some other way to do this cleanly? I'll admit I'm not very > familiar with va_lists. Ah, you're right. By not passing pointers (and I am unfamiliar with va_lists, too), this was a moot suggestion. > > Yeah, my

Re: [PATCH v2] send-email: explicitly disable authentication

2018-10-22 Thread Junio C Hamano
Joshua Watt writes: > It can be necessary to disable SMTP authentication by a mechanism other > than sendemail.smtpuser being undefined. For example, if the user has > sendemail.smtpuser set globally but wants to disable authentication > locally in one repository. I wonder if it would be more

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

2018-10-22 Thread Stefan Beller
> Stepping back a bit, I'd imagine in an ideal world where "make > coccicheck" can be done instantaneously _and_ the spatch machinery > is just as reliable as C compilers. > [...] > Now we do not live in that ideal world and [...] > such a series will have zero > chance of landing in 'pu', unless

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

2018-10-22 Thread Junio C Hamano
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 line option or > reset.quiet config setting.

Re: [PATCH v2] archive: initialize archivers earlier

2018-10-22 Thread Josh Steadmon
On 2018.10.22 20:06, Jeff King wrote: > On Mon, Oct 22, 2018 at 04:51:27PM -0700, Josh Steadmon wrote: > > > > > +test_expect_success GZIP 'git archive with --output and --remote uses > > > > expected format' ' > > > > + git archive --output=d5.tgz --remote=. HEAD && > > > > + gzip

[PATCH v4] archive: initialize archivers earlier

2018-10-22 Thread steadmon
Initialize archivers as soon as possible when running git-archive. Various non-obvious behavior depends on having the archivers initialized, such as determining the desired archival format from the provided filename. Since 08716b3c11 ("archive: refactor file extension format-guessing",

Re: [PATCH v2] archive: initialize archivers earlier

2018-10-22 Thread Jeff King
On Mon, Oct 22, 2018 at 04:51:27PM -0700, Josh Steadmon wrote: > > > +test_expect_success GZIP 'git archive with --output and --remote uses > > > expected format' ' > > > + git archive --output=d5.tgz --remote=. HEAD && > > > + gzip -d -c < d5.tgz > d5.tar && > > > + test_cmp_bin b.tar d5.tar >

[PATCH v3] archive: initialize archivers earlier

2018-10-22 Thread steadmon
Initialize archivers as soon as possible when running git-archive. Various non-obvious behavior depends on having the archivers initialized, such as determining the desired archival format from the provided filename. Since 08716b3c11 ("archive: refactor file extension format-guessing",

Re: [PATCH v2] archive: initialize archivers earlier

2018-10-22 Thread Josh Steadmon
On 2018.10.22 18:35, Jeff King wrote: > On Mon, Oct 22, 2018 at 02:48:11PM -0700, stead...@google.com wrote: > > > Initialize archivers as soon as possible when running git-archive and > > git-upload-archive. Various non-obvious behavior depends on having the > > archivers initialized, such as

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

2018-10-22 Thread Junio C Hamano
Jeff King writes: > If nobody uses it, should we drop the return value, too? Like: Yup. > > diff --git a/read-cache.c b/read-cache.c > index 78c9516eb7..4b44a2eae5 100644 > --- a/read-cache.c > +++ b/read-cache.c > @@ -2052,12 +2052,11 @@ static void *load_cache_entries_thread(void *_data) >

Re: [PATCH] Poison gettext with the Ook language

2018-10-22 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > So I think the only reason to keep it 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 which > doesn't use this API. These messages

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

2018-10-22 Thread Josh Steadmon
On 2018.10.12 15:30, Stefan Beller wrote: > On Thu, Oct 11, 2018 at 6:02 PM wrote: > > > > From: Josh Steadmon > > > > Currently the client advertises that it supports the wire protocol > > version set in the protocol.version config. However, not all services > > support the same set of protocol

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

2018-10-22 Thread Junio C Hamano
SZEDER Gábor writes: > I don't really like how this or the previous RFC patch series deal > with semantic patches (or how some past patch series dealt with them, > for that matter), for various reasons: > ... > How about introducing the concept of "pending" semantic patches, > stored in

Re: [PATCH v2] archive: initialize archivers earlier

2018-10-22 Thread Jeff King
On Mon, Oct 22, 2018 at 02:48:11PM -0700, stead...@google.com wrote: > Initialize archivers as soon as possible when running git-archive and > git-upload-archive. Various non-obvious behavior depends on having the > archivers initialized, such as determining the desired archival format > from the

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

2018-10-22 Thread SZEDER Gábor
On Mon, Oct 22, 2018 at 03:15:05PM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > When `git stash apply ` sees an argument that consists only of > digits, it tries to be smart and interpret it as `stash@{}`. > > Unfortunately, an all-digit hash (which is

Re: [PATCH 1/1] archive: init archivers before determining format

2018-10-22 Thread Jeff King
On Mon, Oct 22, 2018 at 02:47:56PM -0700, Josh Steadmon wrote: > > Does this work with configured archiver extensions, too? I think so, > > because we load them via init_tar_archiver(). > > If you mean things like .tgz and .tar.gz, then yes, they are affected by > the bug as well, and this patch

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

2018-10-22 Thread Eric Sunshine
On Mon, Oct 22, 2018 at 6:15 PM Johannes Schindelin via GitGitGadget wrote: > When `git stash apply ` sees an argument that consists only of > digits, it tries to be smart and interpret it as `stash@{}`. > > Unfortunately, an all-digit hash (which is unlikely but still possible) > is therefore

[PATCH v2 2/3] rebase (autostash): store the full OID in /autostash

2018-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It was reported by Gábor Szeder and analyzed by Alban Gruin that the built-in rebase stores only abbreviated stash hashes in the `autostash` file. This is problematic e.g. in t5520-pull.sh, where the abbreviated hash is so short that it sometimes consists only of

[PATCH v2 1/3] rebase (autostash): avoid duplicate call to state_dir_path()

2018-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We already called that function at this point, and stored the result in the `path` variable. We might just as well use it ;-) Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c

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

2018-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When `git stash apply ` sees an argument that consists only of digits, it tries to be smart and interpret it as `stash@{}`. Unfortunately, an all-digit hash (which is unlikely but still possible) is therefore misinterpreted as `stash@{}` reflog. To prevent that from

[PATCH v2 0/3] Fix rebase autostash

2018-10-22 Thread Johannes Schindelin via GitGitGadget
Gábor reported in https://public-inbox.org/git/20181019124625.gb30...@szeder.dev/ that t5520-pull.sh fails from time to time, and Alban root-caused this to a bug in the built-in rebase. This patch series fixes that, and while at it also fixes an oversight of yours truly when helping Pratik with

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

2018-10-22 Thread Ben Peart
> -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 v3 1/3] reset: don't compute unstaged changes after > reset

[PATCH v3 3/3] repack -ad: prune the list of shallow commits

2018-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin `git repack` can drop unreachable commits without further warning, making the corresponding entries in `.git/shallow` invalid, which causes serious problems when deepening the branches. One scenario where unreachable commits are dropped by `git repack` is when a `git

[PATCH v3 1/3] repack: point out a bug handling stale shallow info

2018-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin A `git fetch --prune` can turn previously-reachable objects unreachable, even commits that are in the `shallow` list. A subsequent `git repack -ad` will then unceremoniously drop those unreachable commits, and the `shallow` list will become stale. This means that when

[PATCH v3 2/3] shallow: offer to prune only non-existing entries

2018-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The `prune_shallow()` function wants a full reachability check to be completed before it goes to work, to ensure that all unreachable entries are removed from the shallow file. However, in the upcoming patch we do not even want to go that far. We really only need to

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

2018-10-22 Thread Johannes Schindelin via GitGitGadget
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 giving them the usual grace period before an eventual git prune (via git gc) prunes

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

2018-10-22 Thread René Scharfe
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 > commit *', the arguments are of type

Bug with "git mv" and submodules, and with "git submodule add something --force"

2018-10-22 Thread Stefan Beller
On Sun, Oct 21, 2018 at 7:52 PM Junio C Hamano wrote: > > Jonathan Nieder writes: > > > Stefan Beller wrote: > > > >> Maybe for now we can do with just an update of the documentation/bugs > >> section and say we cannot move files in and out of submodules? > > > > I think we have some existing

[PATCH v2] archive: initialize archivers earlier

2018-10-22 Thread steadmon
Initialize archivers as soon as possible when running git-archive and git-upload-archive. Various non-obvious behavior depends on having the archivers initialized, such as determining the desired archival format from the provided filename. Since 08716b3c11 ("archive: refactor file extension

Re: [PATCH 1/1] archive: init archivers before determining format

2018-10-22 Thread Josh Steadmon
On 2018.10.19 19:59, Jeff King wrote: > On Fri, Oct 19, 2018 at 04:19:28PM -0700, stead...@google.com wrote: > > > diff --git a/builtin/archive.c b/builtin/archive.c > > index e74f675390..dd3283a247 100644 > > --- a/builtin/archive.c > > +++ b/builtin/archive.c > > @@ -45,7 +45,10 @@ static int

Re: [PATCH 0/1] Fix format detection when archiving remotely

2018-10-22 Thread Josh Steadmon
On 2018.10.19 19:41, Jeff King wrote: > On Fri, Oct 19, 2018 at 04:19:27PM -0700, stead...@google.com wrote: > > > Currently, git-archive does not properly determine the desired archive > > format when both --output and --remote are provided, because > > run_remote_archiver() does not initialize

Re: [PATCH] Poison gettext with the Ook language

2018-10-22 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 22 2018, Ævar Arnfjörð Bjarmason wrote: > On Mon, Oct 22 2018, Nguyễn Thái Ngọc Duy wrote: > >> The current gettext() function just replaces all strings with >> '# GETTEXT POISON #' including format strings and hides the things >> that we should be allowed to grep (like branch

Re: What's cooking in git.git (Oct 2018, #04; Fri, 19)

2018-10-22 Thread Johannes Schindelin
Hi Junio, On Sun, 21 Oct 2018, Junio C Hamano wrote: > Alban Gruin writes: > > > The error comes from the call to `git stash apply $stash_id' in > > builtin/rebase.c:261. When $stash_id only contains decimals and no > > letters, git-stash tries to apply stash@{$stash_id}[0][1]. Thas was not

Re: [PATCH] alias: detect loops in mixed execution mode

2018-10-22 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 22 2018, Jeff King wrote: > On Sat, Oct 20, 2018 at 09:18:21PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> We didn't support chained aliases at all before, so I think the odds >> that people will run into this now will increase as they add "!" to >> existing aliases, and I'd like to

Re: [PATCH] alias: detect loops in mixed execution mode

2018-10-22 Thread Jeff King
On Sat, Oct 20, 2018 at 09:18:21PM +0200, Ævar Arnfjörð Bjarmason wrote: > We didn't support chained aliases at all before, so I think the odds > that people will run into this now will increase as they add "!" to > existing aliases, and I'd like to have git's UI friendly enough to tell > users

Re: [PATCH 1/6] doc: clarify boundaries of 'git worktree list --porcelain'

2018-10-22 Thread Eric Sunshine
On Mon, Oct 22, 2018 at 4:46 PM Andreas Heiduk wrote: > diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt > @@ -270,8 +270,8 @@ Porcelain Format > The porcelain format has a line per attribute. Attributes are listed with a > label and value separated by a single

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

2018-10-22 Thread 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 commit *', the arguments are of type 'struct commit **'. However, currently the comparison

Re: [PATCH] Poison gettext with the Ook language

2018-10-22 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 22 2018, Nguyễn Thái Ngọc Duy wrote: > The current gettext() function just replaces all strings with > '# GETTEXT POISON #' including format strings and hides the things > that we should be allowed to grep (like branch names, or some other > codes) even when gettext is poisoned. > >

Re: [PATCH] Poison gettext with the Ook language

2018-10-22 Thread Johannes Schindelin
Hi Duy, On Mon, 22 Oct 2018, Nguyễn Thái Ngọc Duy wrote: > The current gettext() function just replaces all strings with > '# GETTEXT POISON #' including format strings and hides the things > that we should be allowed to grep (like branch names, or some other > codes) even when gettext is

[PATCH 6/6] doc: fix formatting in git-update-ref

2018-10-22 Thread Andreas Heiduk
Remove the parapgraph numbers from lines explaining the reflog format and typeset these lines in monospace. Signed-off-by: Andreas Heiduk --- Documentation/git-update-ref.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-update-ref.txt

[PATCH 5/6] doc: fix indentation of listing blocks in gitweb.conf.txt

2018-10-22 Thread Andreas Heiduk
'gitweb.conf.txt' uses inconsistent indentation in listing blocks and a mix of listing blocks and literal paragraphs. Both didn't look pretty in the rendered HTML page. Signed-off-by: Andreas Heiduk --- Documentation/gitweb.conf.txt | 25 +++-- 1 file changed, 15

[PATCH 3/6] doc: fix inappropriate monospace formatting

2018-10-22 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- Documentation/git-upload-pack.txt | 1 + Documentation/git.txt | 10 +- Documentation/gitattributes.txt | 30 +++--- Documentation/gitmodules.txt | 17 ++--- Documentation/gitsubmodules.txt | 14

[PATCH 4/6] doc: fix descripion for 'git tag --format'

2018-10-22 Thread Andreas Heiduk
The '--format=' is now listed in the 'OPTIONS' section, not only the '' string itself. The description moved up a few paragraphs because '' is not a standalone paramater but a parameter for the option '--format'. Signed-off-by: Andreas Heiduk --- Documentation/git-tag.txt | 12 ++-- 1

[PATCH 1/6] doc: clarify boundaries of 'git worktree list --porcelain'

2018-10-22 Thread Andreas Heiduk
Defined delimiters for 'git worktree list --porcelain' make the format easier to parse in scripts. For example sed -n '/^worktree ID$/,/^$/p' extracts only the information for the worktree 'ID'. The format did not changed since [1], only the guaranty is added. [1] bb9c03b82a (worktree:

[PATCH 0/6] various fixes for docs

2018-10-22 Thread Andreas Heiduk
A small batch of fixes for the docs. All but the very first fixes formatting and similar stuff. The first one makes parsing 'git worktree list' more future-proof. Andreas Heiduk (6): doc: clarify boundaries of 'git worktree list --porcelain' doc: fix ASCII art tab spacing doc: fix

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

2018-10-22 Thread Johannes Schindelin
Hi Ben, On Mon, 22 Oct 2018, Ben Peart wrote: > 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 >

Re: [PATCH 2/8] gettext: don't poison if GIT_GETTEXT_POISON is set but empty

2018-10-22 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 22 2018, SZEDER Gábor wrote: > This allows us to run test with non-GETTEXT POISON-ed behavior even in > a GETTEXT POISON build by running: > > GIT_GETTEXT_POISON= ./t1234-foo.sh > > Signed-off-by: SZEDER Gábor > --- > Makefile | 2 +- > gettext.c | 9 +++-- > 2 files

[PATCH 6/8] gettext: use an enum for the mode of GETTEXT POISONing

2018-10-22 Thread SZEDER Gábor
The next patch will add a different mode of GETTEXT POISON-ing, therefore named constants will be better than magic numbers. Signed-off-by: SZEDER Gábor --- gettext.c | 12 ++-- gettext.h | 12 +--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gettext.c

[PATCH 4/8] gettext: #ifdef away GETTEXT POISON-related code from _() and Q_()

2018-10-22 Thread SZEDER Gábor
The gettext wrapper functions _() and Q_() contain a GETTEXT POISON-related conditional construct even in non-GETTEXT POISON builds, though both of those conditions are #define-d to be false already at compile time. Both constructs will grow in a later patch, using a GETTEXT POISON-specific enum

[PATCH 5/8] gettext: put "# GETTEXT POISON #" string literal into a macro

2018-10-22 Thread SZEDER Gábor
The "# GETTEXT POISON #" string literal is currently used in two functions in 'gettext.h'. A later patch will add a function to 'gettext.c' using this string literal as well. Avoid this duplication and put that string literal into a macro which is only available in GETTEXT POISON builds.

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

2018-10-22 Thread SZEDER Gábor
Sometimes tests run with GETTEXT POISON fail because of a reason other than a translated string that should not have been translated. In such a case an error message from a git command in the test's verbose output is usually, well, less than helpful: error: # GETTEXT POISON # or fatal: #

[PATCH 8/8] travis-ci: run GETTEXT POISON build job in scrambled mode, too

2018-10-22 Thread SZEDER Gábor
Run the test suite twice in the GETTEXT POISON build: first with GIT_GETTEXT_POISON=scrambled and then with "regular" poisoning, to see whether the scrambled mode hid any mis-translations. Signed-off-by: SZEDER Gábor --- ci/lib-travisci.sh| 1 + ci/run-build-and-tests.sh | 10

[PATCH 3/8] lib-rebase: loosen GETTEXT_POISON check in fake editor

2018-10-22 Thread SZEDER Gábor
The fake editor script created by 't/lib-rebase.sh' recognizes GETTEXT POSION output when the first line of the file to be edited consists solely of the GETTEXT POISON magic string as a comment. However, a later patch will include additional text after that magic string, so that check won't work

[PATCH 2/8] gettext: don't poison if GIT_GETTEXT_POISON is set but empty

2018-10-22 Thread SZEDER Gábor
This allows us to run test with non-GETTEXT POISON-ed behavior even in a GETTEXT POISON build by running: GIT_GETTEXT_POISON= ./t1234-foo.sh Signed-off-by: SZEDER Gábor --- Makefile | 2 +- gettext.c | 9 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile

Re: [PATCH] Poison gettext with the Ook language

2018-10-22 Thread SZEDER Gábor
On Mon, Oct 22, 2018 at 05:36:33PM +0200, Nguyễn Thái Ngọc Duy wrote: > The current gettext() function just replaces all strings with > '# GETTEXT POISON #' including format strings and hides the things > that we should be allowed to grep (like branch names, or some other > codes) even when

[PATCH 1/8] test-lib.sh: preserve GIT_GETTEXT_POISON from the environment

2018-10-22 Thread SZEDER Gábor
Setting GIT_GETTEXT_POISON can be useful when testing translated builds. However, preserving its value from the environment is not as simple as adding it to the list of GIT_* variables that should not be scrubbed from the environment: - GIT_GETTEXT_POISON should not influence git commands

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

2018-10-22 Thread Jeff King
On Mon, Oct 22, 2018 at 11:05:13AM -0400, Ben Peart wrote: > From: Ben Peart > > Remove the src_offset parameter which is unused as a result of switching > to the IEOT table of offsets. Also stop incrementing src_offset in the > multi-threaded codepath as it is no longer used and could cause

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

2018-10-22 Thread Jeff King
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 `--no-quiet` if that is not set. > >

Re: [PATCH 00/59] Split config.txt

2018-10-22 Thread Stefan Beller
On Sat, Oct 20, 2018 at 5:39 AM Nguyễn Thái Ngọc Duy wrote: > > I started this a couple months back, moving a couple big config > sections out of config.txt to make it more manageable. This series > almost completes that. It moves all configs (except http.* which have > changes on 'pu') out of

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

2018-10-22 Thread Ramsay Jones
On 22/10/2018 14:18, 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 of the performance advantages of > avoiding the

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

2018-10-22 Thread Stefan Beller
On Mon, Oct 22, 2018 at 10:39 AM SZEDER Gábor wrote: > > On Tue, Oct 16, 2018 at 04:35:31PM -0700, Stefan Beller wrote: > > the last patch (applying the semantic patches) has been omitted as that > > would produce a lot of merge conflicts. Without that patch, this merges > > cleanly to next. > >

Re: [PATCH v2] send-email: explicitly disable authentication

2018-10-22 Thread Joshua Watt
On Mon, Oct 22, 2018 at 12:52 PM Joshua Watt wrote: > > It can be necessary to disable SMTP authentication by a mechanism other > than sendemail.smtpuser being undefined. For example, if the user has > sendemail.smtpuser set globally but wants to disable authentication > locally in one

[PATCH v2] send-email: explicitly disable authentication

2018-10-22 Thread Joshua Watt
It can be necessary to disable SMTP authentication by a mechanism other than sendemail.smtpuser being undefined. For example, if the user has sendemail.smtpuser set globally but wants to disable authentication locally in one repository. --smtp-auth and sendemail.smtpauth now understand the value

Re: [PATCH] completion: fix __gitcomp_builtin no longer consider extra options

2018-10-22 Thread SZEDER Gábor
On Mon, Oct 22, 2018 at 04:34:16PM +0200, Duy Nguyen wrote: > On Mon, Oct 22, 2018 at 5:51 AM Junio C Hamano wrote: > > > > Nguyễn Thái Ngọc Duy writes: > > > > > __gitcomp_builtin() has the main completion list provided by > > > > > > git xxx --git-completion-helper > > > > > > but the

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

2018-10-22 Thread SZEDER Gábor
On Tue, Oct 16, 2018 at 04:35:31PM -0700, Stefan Beller wrote: > the last patch (applying the semantic patches) has been omitted as that > would produce a lot of merge conflicts. Without that patch, this merges > cleanly to next. > > As for when to apply the semantic patches, I wondered if we

[PATCH 2/3] gpg-interface.c: Support getting key fingerprint via %GF format

2018-10-22 Thread Michał Górny
Support processing VALIDSIG status that provides additional information for valid signatures. Use this information to propagate signing key fingerprint and expose it via %GF pretty format. This format can be used to build safer key verification systems that verify the key via complete

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

2018-10-22 Thread Michał Górny
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 having to explicitly update the conditions. Signed-off-by: Michał Górny

[PATCH 3/3] gpg-interface.c: Obtain primary key fingerprint as well

2018-10-22 Thread Michał Górny
Obtain the primary key fingerprint off VALIDSIG status message, and expose it via %GP format. Signed-off-by: Michał Górny --- Documentation/pretty-formats.txt | 2 ++ gpg-interface.c | 16 +++- gpg-interface.h | 1 + pretty.c

[PATCH] Poison gettext with the Ook language

2018-10-22 Thread Nguyễn Thái Ngọc Duy
The current gettext() function just replaces all strings with '# GETTEXT POISON #' including format strings and hides the things that we should be allowed to grep (like branch names, or some other codes) even when gettext is poisoned. This patch implements the poisoned _() with a universal and

Re: [PATCH v4] gpg-interface.c: detect and reject multiple signatures on commits

2018-10-22 Thread Michał Górny
On Mon, 2018-10-22 at 08:04 +, Michał Górny wrote: > Dnia October 20, 2018 11:57:36 PM UTC, Junio C Hamano > napisał(a): > > Michał Górny writes: > > > > > GnuPG supports creating signatures consisting of multiple signature > > > packets. If such a signature is verified, it outputs all

[PATCH v1] load_cache_entries_threaded: remove unused src_offset parameter

2018-10-22 Thread Ben Peart
From: Ben Peart Remove the src_offset parameter which is unused as a result of switching to the IEOT table of offsets. Also stop incrementing src_offset in the multi-threaded codepath as it is no longer used and could cause confusion. Signed-off-by: Ben Peart --- Notes: Base Ref:

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

2018-10-22 Thread Duy Nguyen
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 of the performance advantages of >

Re: [PATCH 00/59] Split config.txt

2018-10-22 Thread Duy Nguyen
On Sun, Oct 21, 2018 at 1:29 AM Junio C Hamano wrote: > > Ævar Arnfjörð Bjarmason writes: > > > I had a slight bias against this when you started this, since I'm one of > > these odd people who don't mind ~20k line files if the line count isn't > > contributing to inherent complexity, e.g. in

Re: [PATCH v8 7/7] read-cache: load cache entries on worker threads

2018-10-22 Thread Ben Peart
On 10/21/2018 10:14 PM, Junio C Hamano wrote: Jeff King writes: On Wed, Oct 10, 2018 at 11:59:38AM -0400, Ben Peart wrote: +static unsigned long load_cache_entries_threaded(struct index_state *istate, const char *mmap, size_t mmap_size, + unsigned long src_offset,

Re: [PATCH] completion: fix __gitcomp_builtin no longer consider extra options

2018-10-22 Thread Duy Nguyen
On Mon, Oct 22, 2018 at 5:51 AM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > __gitcomp_builtin() has the main completion list provided by > > > > git xxx --git-completion-helper > > > > but the caller can also add extra options that is not provided by > >

Re: [PATCH v4 2/2] worktree: add per-worktree config files

2018-10-22 Thread Duy Nguyen
On Mon, Oct 22, 2018 at 6:54 AM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > index 552827935a..244560a35e 100644 > > --- a/Documentation/config.txt > > +++ b/Documentation/config.txt > > @@ -2,8 +2,9 @@

Re: [PATCH] completion: use __gitcomp_builtin for format-patch

2018-10-22 Thread Duy Nguyen
On Mon, Oct 22, 2018 at 12:17 PM SZEDER Gábor wrote: > > On Sun, Oct 21, 2018 at 10:41:02AM +0200, Nguyễn Thái Ngọc Duy wrote: > > This helps format-patch gain completion for a couple new options, > > notably --range-diff. > > > > Signed-off-by: Nguyễn Thái Ngọc Duy > > --- > > Of course it

  1   2   >