Re: Intermittent failure of t1700-split-index.sh

2017-01-26 Thread Christian Couder
On Fri, Jan 27, 2017 at 4:58 AM, Jeff King wrote: > On Fri, Jan 27, 2017 at 02:45:15AM +, Ramsay Jones wrote: > >> I can't devote any time to looking at this further tonight >> (it's 2-45am here, I'm off to bed!). Can you reproduce the >> problem, or is it just me? :) > > I can

Re: [PATCH v3 4/4] urlmatch: allow globbing for the URL host part

2017-01-26 Thread Patrick Steinhardt
On Thu, Jan 26, 2017 at 12:43:31PM -0800, Junio C Hamano wrote: > Patrick Steinhardt writes: > > > The URL matching function computes for two URLs whether they match not. > > The match is performed by splitting up the URL into different parts and > > then doing an

Re: vger not relaying some of Junio's messages today?

2017-01-26 Thread Jeff King
On Fri, Jan 27, 2017 at 03:57:53AM +, Eric Wong wrote: > I noticed both of these are are missing from my archives > (which rejects messages unless they come from vger): > > > I don't have them

Re: Intermittent failure of t1700-split-index.sh

2017-01-26 Thread Jeff King
On Fri, Jan 27, 2017 at 02:45:15AM +, Ramsay Jones wrote: > I can't devote any time to looking at this further tonight > (it's 2-45am here, I'm off to bed!). Can you reproduce the > problem, or is it just me? :) I can reproduce here with 'pu'. t1700.17 seems to fail reliably with my stress

vger not relaying some of Junio's messages today?

2017-01-26 Thread Eric Wong
I noticed both of these are are missing from my archives (which rejects messages unless they come from vger): https://public-inbox.org/git/20170125234101.n2pzrp77df4zy...@genre.crustytoothpaste.net/#r

Intermittent failure of t1700-split-index.sh

2017-01-26 Thread Ramsay Jones
Hi Christian, I noticed the intermittent failure of t1700-split-index.sh (tests #17 and #18) yesterday. It failed in a full test-suite run, but would not fail when run by hand, until I ran it like so: $ cd t $ for i in `seq 100`; do > echo "== $i ==" > ./t1700-split-index.sh -i

Re: [RFC 02/14] upload-pack: allow ref name and glob requests

2017-01-26 Thread Junio C Hamano
Jonathan Tan writes: >> I am not sure if this "at the conclusion of" is sensible. It is OK >> to assume that what the client side has is fixed, and it is probably >> OK to desire that what the server side has can change, but at the >> same time, it feels quite fragile

Private

2017-01-26 Thread info
Hello, I am Carlos Zulueta Secretary to Dr. Gertjan Vlieghe (Bank Of England), we have an inheritance of a deceased client with your surname Contact Dr. Gertjan Vlieghe With your: Full Name, Tel Number, Age, Occupation and Address through email: gvlie...@yandex.com

Re: [RFC 03/14] upload-pack: test negotiation with changing repo

2017-01-26 Thread Jonathan Tan
On 01/26/2017 02:33 PM, Junio C Hamano wrote: Jonathan Tan writes: diff --git a/t/lib-httpd/one-time-sed.sh b/t/lib-httpd/one-time-sed.sh new file mode 100644 index 0..060ec0300 --- /dev/null +++ b/t/lib-httpd/one-time-sed.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +if

Re: [PATCH] Documentation: implement linkgit macro for Asciidoctor

2017-01-26 Thread brian m. carlson
On Thu, Jan 26, 2017 at 07:18:41PM +, Eric Wong wrote: > > Eric Wong writes: > Junio C Hamano wrote: > > + "\n" > > +"#{target}" > > +"#{attrs[1]}\n" > > + "\n" > > end > > You need the '\' at the end of

Re: [RFC 02/14] upload-pack: allow ref name and glob requests

2017-01-26 Thread Jonathan Tan
On 01/26/2017 02:23 PM, Junio C Hamano wrote: Jonathan Tan writes: Currently, while performing packfile negotiation [1], upload-pack allows clients to specify their desired objects only as SHA-1s. This causes: (a) vulnerability to failure when an object turns

Re: [RFC 00/14] Allow fetch-pack to send ref names (globs allowed)

2017-01-26 Thread Jonathan Tan
Thanks for your comments. On 01/26/2017 03:00 PM, Jeff King wrote: On Wed, Jan 25, 2017 at 02:02:53PM -0800, Jonathan Tan wrote: Negotiation currently happens by upload-pack initially sending a list of refs with names and SHA-1 hashes, and then several request/response pairs in which the

Re: [PATCH v2 3/3] update-ref: add test cases for bare repository

2017-01-26 Thread Junio C Hamano
cornelius.w...@tngtech.com writes: > From: Cornelius Weig > > The default behavior of update-ref to create reflogs differs in > repositories with worktree and bare ones. The existing tests cover only > the behavior of repositories with worktree. > > This commit adds

Re: [PATCH v2 2/3] refs: add option core.logAllRefUpdates = always

2017-01-26 Thread Junio C Hamano
cornelius.w...@tngtech.com writes: > From: Cornelius Weig > > When core.logallrefupdates is true, we only create a new reflog for refs > that are under certain well-known hierarchies. The reason is that we > know that some hierarchies (like refs/tags) do not typically

Re: [RFC 03/14] upload-pack: test negotiation with changing repo

2017-01-26 Thread Junio C Hamano
Jonathan Tan writes: > diff --git a/t/lib-httpd/one-time-sed.sh b/t/lib-httpd/one-time-sed.sh > new file mode 100644 > index 0..060ec0300 > --- /dev/null > +++ b/t/lib-httpd/one-time-sed.sh > @@ -0,0 +1,8 @@ > +#!/bin/sh > + > +if [ -e one-time-sed ]; then > +

Re: [PATCH] git-bisect: allow running in a working tree subdirectory

2017-01-26 Thread Junio C Hamano
Johannes Sixt writes: > Am 26.01.2017 um 19:30 schrieb marcandre.lur...@redhat.com: >> From: Marc-André Lureau >> >> It looks like it can do it. >> >> Signed-off-by: Marc-André Lureau >> --- >> git-bisect.sh | 1 + >> 1

Re: [PATCH v2 1/3] config: add markup to core.logAllRefUpdates doc

2017-01-26 Thread Junio C Hamano
cornelius.w...@tngtech.com writes: > From: Cornelius Weig > > Signed-off-by: Cornelius Weig > --- > > Notes: > As suggested, I moved the modification of the markup to its own commit. > > Documentation/config.txt | 5 +++-- > 1 file

What's cooking in git.git (Jan 2017, #05; Thu, 26)

2017-01-26 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: [RFC 00/14] Allow fetch-pack to send ref names (globs allowed)

2017-01-26 Thread Jeff King
On Wed, Jan 25, 2017 at 02:02:53PM -0800, Jonathan Tan wrote: > Negotiation currently happens by upload-pack initially sending a list of > refs with names and SHA-1 hashes, and then several request/response > pairs in which the request from fetch-pack consists of SHA-1 hashes > (selected from the

[PATCH v2 2/3] refs: add option core.logAllRefUpdates = always

2017-01-26 Thread cornelius . weig
From: Cornelius Weig When core.logallrefupdates is true, we only create a new reflog for refs that are under certain well-known hierarchies. The reason is that we know that some hierarchies (like refs/tags) do not typically change, and that unknown hierarchies might

[PATCH v2 1/3] config: add markup to core.logAllRefUpdates doc

2017-01-26 Thread cornelius . weig
From: Cornelius Weig Signed-off-by: Cornelius Weig --- Notes: As suggested, I moved the modification of the markup to its own commit. Documentation/config.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[PATCH v2 3/3] update-ref: add test cases for bare repository

2017-01-26 Thread cornelius . weig
From: Cornelius Weig The default behavior of update-ref to create reflogs differs in repositories with worktree and bare ones. The existing tests cover only the behavior of repositories with worktree. This commit adds tests that assert the correct behavior in bare

Re: [RFC 02/14] upload-pack: allow ref name and glob requests

2017-01-26 Thread Junio C Hamano
Jonathan Tan writes: > Currently, while performing packfile negotiation [1], upload-pack allows > clients to specify their desired objects only as SHA-1s. This causes: > (a) vulnerability to failure when an object turns non-existent during > negotiation, which may

Re: [RFC 00/14] Allow fetch-pack to send ref names (globs allowed)

2017-01-26 Thread Stefan Beller
On Wed, Jan 25, 2017 at 2:02 PM, Jonathan Tan wrote: > Hello everyone - this is a proposal for a protocol change to allow the > fetch-pack/upload-pack to converse in terms of ref names (globs > allowed), and also an implementation of the server (upload-pack) and >

Re: HEAD's reflog entry for a renamed branch

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 01:30:54PM -0800, Junio C Hamano wrote: > > - "git branch -m" does seem to realize when we are renaming HEAD, > > because it updates HEAD to point to the new branch name. But it > > should probably insert another reflog entry mentioning the rename > > (we do

Re: [PATCH] git-bisect: allow running in a working tree subdirectory

2017-01-26 Thread Johannes Sixt
Am 26.01.2017 um 19:30 schrieb marcandre.lur...@redhat.com: From: Marc-André Lureau It looks like it can do it. Signed-off-by: Marc-André Lureau --- git-bisect.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-bisect.sh

Re: HEAD's reflog entry for a renamed branch

2017-01-26 Thread Junio C Hamano
Jeff King writes: > It's unfortunate that there's no message. This is because the rename > calls delete_ref() under the hood, but that function doesn't take a > reflog message argument at all. It usually doesn't matter because > deleting the ref will also delete the reflog. > >

Re: "git fetch -p" incorrectly deletes branches

2017-01-26 Thread Jeff King
On Tue, Jan 17, 2017 at 07:04:28AM +0100, Reimar Döffinger wrote: > Deletes refs/heads/test every second time when run repeatedly: > > $ git fetch -p -v origin master:refs/heads/test > From https://github.com/git/git > * [new branch] master -> test > = [up to date] master

Re: [PATCH v3 4/4] urlmatch: allow globbing for the URL host part

2017-01-26 Thread Junio C Hamano
Junio C Hamano writes: > Junio C Hamano writes: > >> +while (url_len && pat_len) { >> +const char *url_next = end_of_token(url, '.', url_len); >> +const char *pat_next = end_of_token(pat, '.', pat_len); >> + ... >> } >> >>

Re: HEAD's reflog entry for a renamed branch

2017-01-26 Thread Jeff King
On Mon, Jan 16, 2017 at 06:17:29PM -0500, Kyle Meyer wrote: > I noticed that, after renaming the current branch, the corresponding > message in .git/logs/HEAD is empty. > > For example, running > > $ mkdir test-repo > $ cd test-repo > $ git init > $ echo abc >file.txt > $

Re: SubmittingPatches: drop temporal reference for PGP signing

2017-01-26 Thread Philip Oakley
From: "Junio C Hamano" Cornelius Weig writes: How about something along these lines? Does the forward reference break the main line of thought too severly? I find it a bit distracting for those who know PGP signing has nothing to do with

Re: Force Confirmation for Dropping Changed Lines

2017-01-26 Thread Junio C Hamano
Hilco Wijbenga writes: > On 25 January 2017 at 18:32, Junio C Hamano wrote: >> I think you should be able to do something like >> >> $ cat >$HOME/bin/fail-3way <<\EOF >> #!/bin/sh >> git merge-file "$@" >> exit 1 >>

Re: [PATCH v3 4/4] urlmatch: allow globbing for the URL host part

2017-01-26 Thread Junio C Hamano
Junio C Hamano writes: > + while (url_len && pat_len) { > + const char *url_next = end_of_token(url, '.', url_len); > + const char *pat_next = end_of_token(pat, '.', pat_len); > + ... > } > > + return 1; Embarrassing. The last one must

Re: [PATCH v3 4/4] urlmatch: allow globbing for the URL host part

2017-01-26 Thread Junio C Hamano
Patrick Steinhardt writes: > The URL matching function computes for two URLs whether they match not. > The match is performed by splitting up the URL into different parts and > then doing an exact comparison with the to-be-matched URL. > > The main user of `urlmatch`

Re: [PATCH] git-bisect: allow running in a working tree subdirectory

2017-01-26 Thread Junio C Hamano
Stefan Beller writes: > + Duy, main author of the worktree feature. > > On Thu, Jan 26, 2017 at 10:30 AM, wrote: >> From: Marc-André Lureau >> >> It looks like it can do it. >> >> Signed-off-by: Marc-André Lureau

Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-26 Thread Junio C Hamano
Johannes Schindelin writes: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index af2ae4cc02..f2c210f0a0 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -1949,6 +1949,13 @@ Environment variable settings always

Re: Force Confirmation for Dropping Changed Lines

2017-01-26 Thread Hilco Wijbenga
On 25 January 2017 at 18:32, Junio C Hamano wrote: > I think you should be able to do something like > > $ cat >$HOME/bin/fail-3way <<\EOF > #!/bin/sh > git merge-file "$@" > exit 1 > EOF > $ chmod +x $HOME/bin/fail-3way >

Re: [PATCH] Documentation: implement linkgit macro for Asciidoctor

2017-01-26 Thread Eric Wong
> Eric Wong writes: > > You can use '\' to continue long lines with any Ruby version: > > > > "" \ > > "#{target}" \ > > "#{attrs[1]}" \ > > "" Junio C Hamano wrote: > + "\n" > +"#{target}" > +

Re: [PATCH 2/2] fsck: lazily load types under --connectivity-only

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 10:51:00AM -0800, Junio C Hamano wrote: > > 2. It serves as a cross-check that the coercion in (1a) is > > correct (i.e., we'll complain about a parent link that > > points to a blob). But we get most of this for free > > already, because right after

Re: [PATCH 2/2] ref-filter: add function to parse atoms from a nul-terminated string

2017-01-26 Thread Junio C Hamano
SZEDER Gábor writes: > On Wed, Dec 7, 2016 at 5:09 PM, SZEDER Gábor wrote: >> ref-filter's parse_ref_filter_atom() function parses an atom between >> the start and end pointers it gets as arguments. This is fine for two >> of its callers, which

Re: [PATCH] rebase: pass --signoff option to git am

2017-01-26 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 9:03 PM, Giuseppe Bilotta wrote: > On Mon, Jan 23, 2017 at 7:13 PM, Junio C Hamano wrote: >> >> Should we plan to extend this to the interactive backend that is >> shared between rebase -i and rebase -m, too? Or is this

Re: [PATCH] mingw: allow hooks to be .exe files

2017-01-26 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Peff, > > On Wed, 25 Jan 2017, Jeff King wrote: > >> On Wed, Jan 25, 2017 at 05:58:42PM +0100, Johannes Schindelin wrote: >> >> > - if (access(path.buf, X_OK) < 0) >> > + if (access(path.buf, X_OK) < 0) { >> > +#ifdef

Re: [PATCH 2/2] fsck: lazily load types under --connectivity-only

2017-01-26 Thread Junio C Hamano
Jeff King writes: > The recent fixes to "fsck --connectivity-only" load all of > the objects with their correct types. This keeps the > connectivity-only code path close to the regular one, but it > also introduces some unnecessary inefficiency. While getting > the type of an

Re: [PATCH 4/5] revision.c: refactor ref selection handler after --exclude

2017-01-26 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Jan 26, 2017 at 3:57 AM, Jeff King wrote: >> I don't think it means either. It means to include remotes in the >> selected revisions, but excluding the entries mentioned by --exclude. >> >> IOW: >> >> --exclude=foo --remotes >>

Re: [PATCH] git-bisect: allow running in a working tree subdirectory

2017-01-26 Thread Stefan Beller
+ Duy, main author of the worktree feature. On Thu, Jan 26, 2017 at 10:30 AM, wrote: > From: Marc-André Lureau > > It looks like it can do it. > > Signed-off-by: Marc-André Lureau > --- > git-bisect.sh | 1

Re: PATCH 1/2] abspath: add absolute_pathdup()

2017-01-26 Thread Brandon Williams
On 01/26, René Scharfe wrote: > Add a function that returns a buffer containing the absolute path of its > argument and a semantic patch for its intended use. It avoids an extra > string copy to a static buffer. > > Signed-off-by: Rene Scharfe > --- > abspath.c

[PATCH] git-bisect: allow running in a working tree subdirectory

2017-01-26 Thread marcandre . lureau
From: Marc-André Lureau It looks like it can do it. Signed-off-by: Marc-André Lureau --- git-bisect.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-bisect.sh b/git-bisect.sh index ae3cb013e..b0bd604d4 100755 ---

Re: [PATCH] gpg-interface: Add some output from gpg when it errors out.

2017-01-26 Thread Junio C Hamano
Mike Hommey writes: >> With that information recorded in the log (or in-code comment, or >> both), if it turns out that some lines with the prefix are useful >> (or some other lines without the prefix are not very useful), they >> can tweak the filtering criteria as

Re: [RFC 12/14] fetch-pack: do not printf after closing stdout

2017-01-26 Thread Jonathan Tan
On 01/25/2017 04:50 PM, Stefan Beller wrote: On Wed, Jan 25, 2017 at 2:03 PM, Jonathan Tan wrote: In fetch-pack, during a stateless RPC, printf is invoked after stdout is closed. Update the code to not do this, preserving the existing behavior. This seems to me as

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

2017-01-26 Thread Junio C Hamano
Jeff King writes: > On Thu, Jan 26, 2017 at 07:39:55AM +0100, Johannes Sixt wrote: > >> Am 25.01.2017 um 23:01 schrieb Jeff King: >> > +#pragma GCC diagnostic ignored "-Wformat-zero-length" >> >> Last time I used #pragma GCC in a cross-platform project, it triggered an >>

Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)

2017-01-26 Thread Junio C Hamano
Lars Schneider writes: > The difference between Travis and my machine is that I changed the > default shell to ZSH with a few plugins [1]. If I run the test with > plain BASH on my Mac then I can reproduce the test failure. Therefore, > we might want to adjust the

Re: SubmittingPatches: drop temporal reference for PGP signing

2017-01-26 Thread Junio C Hamano
Cornelius Weig writes: > How about something along these lines? Does the forward reference > break the main line of thought too severly? I find it a bit distracting for those who know PGP signing has nothing to do with signing off your patch, but I think that is OK

Re: [PATCH v2 1/1] status: be prepared for not-yet-started interactive rebase

2017-01-26 Thread Stefan Beller
On Thu, Jan 26, 2017 at 8:08 AM, Johannes Schindelin wrote: > Some developers might want to call `git status` in a working > directory where they just started an interactive rebase, but the > edit script is still opened in the editor. > > Let's show a meaningful

Re: [PATCH v2 1/1] status: be prepared for not-yet-started interactive rebase

2017-01-26 Thread Matthieu Moy
Johannes Schindelin writes: > Some developers might want to call `git status` in a working > directory where they just started an interactive rebase, but the > edit script is still opened in the editor. > > Let's show a meaningful message in such cases. > >

Re: SubmittingPatches: drop temporal reference for PGP signing

2017-01-26 Thread Stefan Beller
On Thu, Jan 26, 2017 at 5:30 AM, Cornelius Weig wrote: > >> >> Yeah I agree. My patch was not the best shot by far. >> > > How about something along these lines? Does the forward reference > break the main line of thought too severly? > > diff --git

[PATCH 2/2] use absolute_pathdup()

2017-01-26 Thread René Scharfe
Apply the symantic patch for converting callers that duplicate the result of absolute_path() to call absolute_pathdup() instead, which avoids an extra string copy to a static buffer. Signed-off-by: Rene Scharfe --- builtin/clone.c | 4 ++-- builtin/submodule--helper.c

PATCH 1/2] abspath: add absolute_pathdup()

2017-01-26 Thread René Scharfe
Add a function that returns a buffer containing the absolute path of its argument and a semantic patch for its intended use. It avoids an extra string copy to a static buffer. Signed-off-by: Rene Scharfe --- abspath.c| 7 +++ cache.h

[PATCH v2 1/1] status: be prepared for not-yet-started interactive rebase

2017-01-26 Thread Johannes Schindelin
Some developers might want to call `git status` in a working directory where they just started an interactive rebase, but the edit script is still opened in the editor. Let's show a meaningful message in such cases. Signed-off-by: Johannes Schindelin ---

[PATCH v2 0/1] Let `git status` handle a not-yet-started `rebase -i` gracefully

2017-01-26 Thread Johannes Schindelin
When the `done` file is missing, we die()d. This is not necessary, we can do much better than that. Changes since v1: - When `done` is missing, we still read `git-rebase-todo` and report the next steps. - We now report a missing git-rebase-todo. - Added a test (thanks, Matthieu, for prodding

SoC Microprojects 2017

2017-01-26 Thread Pranit Bauva
Hey everyone, I helped in just re-organizing the micro project list for 2017. I have removed the ones which I remember have been done and I have added one new. Please add any microproject if it comes to your mind or reply here so I will add it. Unfortunately, I can't send the patch here (SMTP

[PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-26 Thread Johannes Schindelin
From: Segev Finer This environment variable and configuration value allow to override the autodetection of plink/tortoiseplink in case that Git gets it wrong. [jes: wrapped overly-long lines, changed get_ssh_variant() to handle_ssh_variant() to accomodate the change from the

[PATCH v2 2/3] connect: rename tortoiseplink and putty variables

2017-01-26 Thread Johannes Schindelin
From: Junio C Hamano One of these two may have originally been named after "what exact SSH implementation do we have" so that we can tweak the command line options, but these days "putty=1" no longer means "We are using the plink SSH implementation that comes with PuTTY". It

[PATCH v2 1/3] connect: handle putty/plink also in GIT_SSH_COMMAND

2017-01-26 Thread Johannes Schindelin
From: Segev Finer Git for Windows has special support for the popular SSH client PuTTY: when using PuTTY's non-interactive version ("plink.exe"), we use the -P option to specify the port rather than OpenSSH's -p option. TortoiseGit ships with its own, forked version of

[PATCH v2 0/3] Handle PuTTY (plink/tortoiseplink) even in GIT_SSH_COMMAND

2017-01-26 Thread Johannes Schindelin
We already handle PuTTY's plink and TortoiseGit's tortoiseplink in GIT_SSH by automatically using the -P option to specify ports, and in tortoiseplink's case by passing the --batch option. For users who need to pass additional command-line options to plink, this poses a problem: the only way to

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

2017-01-26 Thread Johannes Schindelin
Hi Peff, On Thu, 26 Jan 2017, Jeff King wrote: > On Thu, Jan 26, 2017 at 12:16:10PM +0100, Johannes Schindelin wrote: > > > We could switch the DEVELOPER option on by default, when gcc or clang > > is used at least. Otherwise the DEVELOPER option (which I like very > > much) would not be able

Re: [PATCH] refs: add option core.logAllRefUpdates = always

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 03:06:40PM +0100, Cornelius Weig wrote: > > But it works quite by accident. I wonder if we should this > > "is_bare_repository" check into a function that can be called instead of > > accessing log_all_ref_updates() directly. > > Are you saying that we should move the

Re: [PATCH] connect: handle putty/plink also in GIT_SSH_COMMAND

2017-01-26 Thread Johannes Schindelin
Hi Junio, On Wed, 25 Jan 2017, Junio C Hamano wrote: > Subject: [PATCH] connect: rename tortoiseplink and putty variables > > One of these two may have originally been named after "what exact > SSH implementation do we have" so that we can tweak the command line > options, but these days

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 12:16:10PM +0100, Johannes Schindelin wrote: > We could switch the DEVELOPER option on by default, when gcc or clang is > used at least. Otherwise the DEVELOPER option (which I like very much) > would not be able to live up to its full potential. I'm not sure that is a

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 12:37:46PM +0100, Johannes Schindelin wrote: > > Am 25.01.2017 um 23:01 schrieb Jeff King: > > > +#pragma GCC diagnostic ignored "-Wformat-zero-length" > > > > Last time I used #pragma GCC in a cross-platform project, it triggered > > an "unknown pragma" warning for MSVC.

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 07:39:55AM +0100, Johannes Sixt wrote: > Am 25.01.2017 um 23:01 schrieb Jeff King: > > +#pragma GCC diagnostic ignored "-Wformat-zero-length" > > Last time I used #pragma GCC in a cross-platform project, it triggered an > "unknown pragma" warning for MSVC. (It was the C++

Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 10:48:30AM +0100, Lars Schneider wrote: > Oh. I must have made a mistake on my very first test run. I can reproduce > the failure with ZSH and my plugins... looks like it's a Mac OS problem > and no TravisCI only problem after all. Thanks for digging into it. If it's

Re: [PATCH 4/5] revision.c: refactor ref selection handler after --exclude

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 04:28:17PM +0700, Duy Nguyen wrote: > On Thu, Jan 26, 2017 at 3:57 AM, Jeff King wrote: > > I don't think it means either. It means to include remotes in the > > selected revisions, but excluding the entries mentioned by --exclude. > > > > IOW: > > > >

Re: [PATCH 2/5] revision.c: group ref selection options together

2017-01-26 Thread Jeff King
On Thu, Jan 26, 2017 at 04:18:06PM +0700, Duy Nguyen wrote: > > Hmm. I see what you're trying to do here, and abstract the repeated > > bits. But I'm not sure the line-count reflects a real simplification. > > Everything ends up converted to an enum, and then that enum just expands > > to similar

Re: [PATCH] refs: add option core.logAllRefUpdates = always

2017-01-26 Thread Cornelius Weig
Hi Peff, thanks for your thoughts. > I tried to read this patch with fresh eyes. But given the history, you > may take my review with a grain of salt. :) Does it mean another reviewer is needed? > I don't think my original had tests for this, but it might be worth > adding a test for this

Re: [DEMO][PATCH v2 6/5] compat: add a qsort_s() implementation based on GNU's qsort_r(1)

2017-01-26 Thread Johannes Schindelin
Hi, On Wed, 25 Jan 2017, Jeff King wrote: > On Wed, Jan 25, 2017 at 07:43:01PM +0100, René Scharfe wrote: > > > If we find such cases then we'd better fix them for all platforms, e.g. by > > importing timsort, no? > > Yes, as long as they are strict improvements. I think in many cases, we may

Re: [PATCH] mingw: allow hooks to be .exe files

2017-01-26 Thread Johannes Schindelin
Hi Junio, On Wed, 25 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This change is necessary to allow the files in .git/hooks/ to optionally > > have the file extension `.exe` on Windows, as the file names are > > hardcoded otherwise. > > Hmph.

Re: SubmittingPatches: drop temporal reference for PGP signing

2017-01-26 Thread Cornelius Weig
> > Yeah I agree. My patch was not the best shot by far. > How about something along these lines? Does the forward reference break the main line of thought too severly? diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 08352de..c2b0cbe 100644 ---

Re: [PATCH 2/2] ref-filter: add function to parse atoms from a nul-terminated string

2017-01-26 Thread SZEDER Gábor
On Wed, Dec 7, 2016 at 5:09 PM, SZEDER Gábor wrote: > ref-filter's parse_ref_filter_atom() function parses an atom between > the start and end pointers it gets as arguments. This is fine for two > of its callers, which process '%(atom)' format specifiers and the end >

[PATCH v2] mingw: allow hooks to be .exe files

2017-01-26 Thread Johannes Schindelin
This change is necessary to allow the files in .git/hooks/ to optionally have the file extension `.exe` on Windows, as the file names are hardcoded otherwise. Signed-off-by: Johannes Schindelin --- Published-As:

Re: [PATCH] mingw: allow hooks to be .exe files

2017-01-26 Thread Johannes Schindelin
Hi Peff, On Wed, 25 Jan 2017, Jeff King wrote: > On Wed, Jan 25, 2017 at 05:58:42PM +0100, Johannes Schindelin wrote: > > > - if (access(path.buf, X_OK) < 0) > > + if (access(path.buf, X_OK) < 0) { > > +#ifdef STRIP_EXTENSION > > + strbuf_addstr(, ".exe"); > > I think

Re: [PATCH] Retire the `relink` command

2017-01-26 Thread Johannes Schindelin
Hi Eric, On Wed, 25 Jan 2017, Eric Wong wrote: > Johannes Schindelin wrote: > > Back in the olden days, when all objects were loose and rubber boots > > were made out of wood, it made sense to try to share (immutable) > > objects between repositories. > > > > Ever

Re: [PATCH 2/2] fsck: lazily load types under --connectivity-only

2017-01-26 Thread Johannes Schindelin
Hi Peff, On Wed, 25 Jan 2017, Jeff King wrote: > builtin/fsck.c | 58 > +++--- > fsck.c | 4 > 2 files changed, 11 insertions(+), 51 deletions(-) Patch looks good to my eyes. Ciao, Johannes

Re: [PATCH] connect: handle putty/plink also in GIT_SSH_COMMAND

2017-01-26 Thread Johannes Schindelin
Hi Junio, On Wed, 25 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Now, with the patch in question (without the follow-up, which I would > > like to ask you to ignore, just like you did so far), Git would not > > figure out that your script

Re: [PATCH] Documentation: implement linkgit macro for Asciidoctor

2017-01-26 Thread Johannes Schindelin
Hi Brian, On Thu, 26 Jan 2017, brian m. carlson wrote: > AsciiDoc uses a configuration file to implement macros like linkgit, > while Asciidoctor uses Ruby extensions. Implement a Ruby extension that > implements the linkgit macro for Asciidoctor in the same way that > asciidoc.conf does for

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

2017-01-26 Thread Johannes Schindelin
Hi Hannes, On Thu, 26 Jan 2017, Johannes Sixt wrote: > Am 25.01.2017 um 23:01 schrieb Jeff King: > > +#pragma GCC diagnostic ignored "-Wformat-zero-length" > > Last time I used #pragma GCC in a cross-platform project, it triggered > an "unknown pragma" warning for MSVC. It is starting to

Re: sparse checkout - weird behavior

2017-01-26 Thread Paul Hammant
Well I feel a bit silly. Thanks for responding. On Wed, Jan 25, 2017 at 11:59 PM, Jeff King wrote: > On Wed, Jan 25, 2017 at 10:21:19PM -0500, Paul Hammant wrote: > >> Related bug (maybe the same). Reproduction: >> >> $ git clone g...@github.com:jekyll/jekyll.git --no-checkout

Re: Fixing the warning about warning(""); was: Re: [PATCH] difftool.c: mark a file-local symbol with static

2017-01-26 Thread Johannes Schindelin
Hi Peff, On Wed, 25 Jan 2017, Jeff King wrote: > On Wed, Jan 25, 2017 at 11:36:50AM +0100, Johannes Schindelin wrote: > > > > Gross, but at least it's self documenting. :) > > > > > > I guess a less horrible version of that is: > > > > > > static inline warning_blank_line(void) > > > { >

Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)

2017-01-26 Thread Lars Schneider
> On 26 Jan 2017, at 10:14, Lars Schneider wrote: > > >> On 25 Jan 2017, at 23:51, Junio C Hamano wrote: >> >> Jeff King writes: >> >>> I guess the way to dig would be to add a test that looks at the output >>> of "type mv" or

Re: [PATCH 4/5] revision.c: refactor ref selection handler after --exclude

2017-01-26 Thread Duy Nguyen
On Thu, Jan 26, 2017 at 3:57 AM, Jeff King wrote: > I don't think it means either. It means to include remotes in the > selected revisions, but excluding the entries mentioned by --exclude. > > IOW: > > --exclude=foo --remotes > include all remotes except refs/remotes/foo

Re: [PATCH 2/5] revision.c: group ref selection options together

2017-01-26 Thread Duy Nguyen
On Thu, Jan 26, 2017 at 3:50 AM, Jeff King wrote: > On Wed, Jan 25, 2017 at 07:50:51PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> These options have on thing in common: when specified right after >> --exclude, they will de-select refs instead of selecting them by >> default. >> >>

Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)

2017-01-26 Thread Lars Schneider
> On 25 Jan 2017, at 23:51, Junio C Hamano wrote: > > Jeff King writes: > >> I guess the way to dig would be to add a test that looks at the output >> of "type mv" or something, push it to a Travis-hooked branch, and then >> wait for the output > > Sounds

Re: [PATCH 2/5] revision.c: group ref selection options together

2017-01-26 Thread Duy Nguyen
On Thu, Jan 26, 2017 at 4:11 AM, Junio C Hamano wrote: > * I am expecting that the new one yet to be introduced will not >share the huge "switch (selector)" part, but does its own things >in a separate function with a similar structure. The only thing >common