Re: [PATCH v1 0/2] Fix default macOS build locally and on Travis CI

2016-11-09 Thread Torsten Bögershausen
On 10/11/16 00:39, Junio C Hamano wrote: I've followed what was available at the public-inbox archive, but it is unclear what the conclusion was. For the first one your "how about" non-patch, to which Peff said "that's simple and good", looked good to me as well, but is it available as a final

What's cooking in git.git (Nov 2016, #01; Wed, 9)

2016-11-09 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. Hopefully 2.11-rc1 can be tagged b

Re: [PATCH 5/6] config docs: Provide for config to specify tags not to abbreviate

2016-11-09 Thread Markus Hitter
Am 10.11.2016 um 00:31 schrieb Ian Jackson: > I am proposing to set this configuration setting automatically in > dgit. Other tools that work with particular git tags would do the > same. There would be no need for users to do anything. > > Having this as an option in a menu would be quite wrong

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 09, 2016 at 02:58:37PM -0800, Junio C Hamano wrote: > > I'm slightly confused. Did you mean "supporting any in-tree symlink to > an out-of-tree destination" in your first sentence? I was trying to say that these "control files used solely by git" have no business

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 04:18:29PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > On Wed, Nov 09, 2016 at 02:58:37PM -0800, Junio C Hamano wrote: > > > > I'm slightly confused. Did you mean "supporting any in-tree symlink to > > an out-of-tree destination" in your first sentence? > > I

Re: 2.11.0-rc1 will not be tagged for a few days

2016-11-09 Thread Junio C Hamano
Jeff King writes: > I think we also need to make a final decision on the indent/compaction > heuristic naming. After reading Michael's [0], and the claim by you and > Stefan that the "compaction" name was declared sufficiently experimental > that we could later take it away, I'm inclined to follo

Re: [PATCH v1 0/2] Fix default macOS build locally and on Travis CI

2016-11-09 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > Apple removed the OpenSSL header files in macOS and therefore Git does > not build out of the box on macOS anymore. See previous discussion with > Torsten here: http://public-inbox.org/git/565b3036.8000...@web.de/ > > This mini series ma

Re: 2.11.0-rc1 will not be tagged for a few days

2016-11-09 Thread Junio C Hamano
Jeff King writes: > It's just that I found myself writing up notes like "this should be > merged", and it occurred to me that I could communicate the same things > by sending you a proposed history. So I'm curious if you find dissecting > it via "git log" more or less convenient than a list of no

Re: [PATCH 5/6] config docs: Provide for config to specify tags not to abbreviate

2016-11-09 Thread Ian Jackson
Junio C Hamano writes ("Re: [PATCH 5/6] config docs: Provide for config to specify tags not to abbreviate"): > Ian Jackson writes: > > This is not correct, because as I have explained, this should be a > > per-tree configuration: > > I do not have fundamental opposition to make it part of .git/c

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 02:58:37PM -0800, Junio C Hamano wrote: > Duy Nguyen writes: > > > Let's err on the safe side and disable symlinks to outside repo by > > default (or even all symlinks on .gitattributes and .gitignore as the > > first step) > > > > What I learned from my changes in .gitig

Re: [PATCH v5 01/16] Git.pm: add subroutines for commenting lines

2016-11-09 Thread Junio C Hamano
Jakub Narębski writes: >> I prefer to have like this instead >> >> sub prefix_lines { >> my $prefix = shift; >> my $string = join("\n", @_); >> $string =~ s/^/$prefix/mg; >> return $string; >> } >> >> So both subroutines can take several strings as arguments. > >

Re: git mergetool indefinite hang on version 2.10+

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 02:54:59PM -0800, Mike Dacre wrote: > I have no idea how to debug this. As of git version 2.10.0 git hangs > indefinitely when I run `git mergetool`, the result is the same if I > run `git mergetool --tool-help`. Mergetool is a shell script. Try setting GIT_TRACE=1 in the

Re: [PATCH 5/6] config docs: Provide for config to specify tags not to abbreviate

2016-11-09 Thread Junio C Hamano
Ian Jackson writes: >> But I think the right >> place to do so would be Edit -> Preferences menu in Gitk, and the >> settings will be stored in ~/.gitk or ~/.config/git/gitk or whatever >> gitk-specific place. > > This is not correct, because as I have explained, this should be a > per-tree confi

Re: [PATCH 0/3] gitk: memory consumption improvements

2016-11-09 Thread Junio C Hamano
Markus Hitter writes: > Am 08.11.2016 um 22:37 schrieb Junio C Hamano: >> Are all semi-modern Tcl/Tk in service have this -undo thing so that >> we can pass unconditionally to the text widget like the patch does? > > Good point. As far as my research goes, this flag was introduced in Nov. 2001: >

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Junio C Hamano
Duy Nguyen writes: > Let's err on the safe side and disable symlinks to outside repo by > default (or even all symlinks on .gitattributes and .gitignore as the > first step) > > What I learned from my changes in .gitignore is, if we have not > forbidden something, people likely find some creative

Re: Regarding "git log" on "git series" metadata

2016-11-09 Thread Junio C Hamano
Josh Triplett writes: >> This would definitely need protocol extension when transferring >> objects across repositories. > > It'd also need a repository format extension locally. Otherwise, if you > ever touched that repository with an older git (or a tool built on an > older libgit2 or JGit or

git mergetool indefinite hang on version 2.10+

2016-11-09 Thread Mike Dacre
Hi all, I have no idea how to debug this. As of git version 2.10.0 git hangs indefinitely when I run `git mergetool`, the result is the same if I run `git mergetool --tool-help`. The result is identical regardless of which version of vim I have installed, or where vim in installed. It is also the

Re: [PATCHv2 32/36] pathspec: allow querying for attributes

2016-11-09 Thread Stefan Beller
On Wed, Nov 9, 2016 at 1:57 AM, Duy Nguyen wrote: > On Sat, Oct 29, 2016 at 1:54 AM, Stefan Beller wrote: >> The pathspec mechanism is extended via the new >> ":(attr:eol=input)pattern/to/match" syntax to filter paths so that it >> requires paths to not just match the given pattern but also have

Re: [PATCH] sequencer: shut up clang warning

2016-11-09 Thread Jakub Narębski
W dniu 09.11.2016 o 14:56, Johannes Schindelin pisze: > When comparing a value of type `enum todo_command` with a value that is > outside the defined enum constants, clang greets the developer with this > warning: > > comparison of constant 2 with expression of type > 'const enum todo

Re: [PATCH 32/36] pathspec: allow querying for attributes

2016-11-09 Thread Junio C Hamano
Stefan Beller writes: > On Wed, Nov 9, 2016 at 1:45 AM, Duy Nguyen wrote: >> On Fri, Oct 28, 2016 at 1:29 AM, Junio C Hamano wrote: >>> ... >>> The strategy this round takes to make it unnecessary to punt >>> preloading (i.e. dropping "pathspec: disable preload-index when >>> attribute pathspec

Re: [PATCH v5 01/16] Git.pm: add subroutines for commenting lines

2016-11-09 Thread Jakub Narębski
W dniu 09.11.2016 o 18:02, Vasco Almeida pisze: > A Ter, 08-11-2016 às 17:06 -0800, Junio C Hamano escreveu: >> Vasco Almeida writes: >>> +sub comment_lines { >>> + my $comment_line_char = config("core.commentchar") || '#'; >>> + return prefix_lines("$comment_line_char ", @_); >>> +} >>> + >>

[PATCH] remote-curl: don't hang when a server dies before any output

2016-11-09 Thread David Turner
In the event that a HTTP server closes the connection after giving a 200 but before giving any packets, we don't want to hang forever waiting for a response that will never come. Instead, we should die immediately. One case where this happens is when attempting to fetch a dangling object by SHA.

Re: [git-for-windows] [ANNOUNCE] Prerelease: Git for Windows v2.11.0-rc0

2016-11-09 Thread Lars Schneider
On 05 Nov 2016, at 10:50, Johannes Schindelin wrote: > Dear Git users, > > I finally got around to rebase the Windows-specific patches (which seem to > not make it upstream as fast as we get new ones) on top of upstream Git > v2.11.0-rc0, and to bundle installers, portable Git and MinGit [*1*]

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 12:41:22PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > For matching specific names, we have to deal with case-folding. It's > > easy to hit the common ones like ".GITIGNORE" with fspathcmp(). But if > > this is actually protection against malicious repositorie

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Junio C Hamano
Jeff King writes: > For matching specific names, we have to deal with case-folding. It's > easy to hit the common ones like ".GITIGNORE" with fspathcmp(). But if > this is actually protection against malicious repositories, we have to > match all of the horrible filesystem-specific junk that we

Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

2016-11-09 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > --- > v2 changes just the subject line That's not sufficient, is it? What you did in the documentation would raise the same "Hmph, is this only about HEAD?" and unlike the commit subject, it will carve it in stone for end-users.

Please reply me

2016-11-09 Thread Rebecca Taylor
My dear friend, I am Mrs Rebecca Taylor from Kuwait married to Late Mr. Alfred Taylor from Ivory Coast West Africa, of paroisse saint sebastien Church. I and My late husband has done numerous charity service within and outside our region since 1981. We have been doing our best to promote chari

Cleaning ignored files

2016-11-09 Thread Roman Terekhov
Hi, I want to ask about git clean -dXf command behaviour. I do the following: $ mkdir gitignore_test $ cd gitignore_test/ $ git init Initialized empty Git repository in ~/gitignore_test/.git/ $ echo *.sln > .gitignore $ git add .gitignore $ git commit -m "add gitignore" [master (root-commit) ef

Re: [PATCH 32/36] pathspec: allow querying for attributes

2016-11-09 Thread Stefan Beller
On Wed, Nov 9, 2016 at 1:45 AM, Duy Nguyen wrote: > On Fri, Oct 28, 2016 at 1:29 AM, Junio C Hamano wrote: >> The reason why I am bringing this up in this discussion thread on >> this patch is because I wonder if we would benefit by a similar >> "let's not do too involved things and be cheap by e

Re: [PATCH v5 01/16] Git.pm: add subroutines for commenting lines

2016-11-09 Thread Vasco Almeida
A Ter, 08-11-2016 às 17:06 -0800, Junio C Hamano escreveu: > Vasco Almeida writes: > > > > > Add subroutines prefix_lines and comment_lines. > > > > Signed-off-by: Vasco Almeida > > --- > >  perl/Git.pm | 23 +++ > >  1 file changed, 23 insertions(+) > > > > diff --git a/pe

Re: 2.11.0-rc1 will not be tagged for a few days

2016-11-09 Thread Jeff King
On Tue, Nov 08, 2016 at 10:29:07PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I'm collecting v2.11-rc1 topics in the "refs/heads/for-junio/" section > > of git://github.com/peff/git.git. > > > > I've also got proposed merges for "master" there, though note that none > > of the topics

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 04:22:12PM +0700, Duy Nguyen wrote: > > Symlinks are likewise tricky. If we see that a symlink points to > > "foo/../bar", then we don't know if it leaves the repository unless we > > also look at "foo" to see if it is also a symlink. So you really end up > > having to res

Re: [PATCH] sequencer: shut up clang warning

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 02:56:25PM +0100, Johannes Schindelin wrote: > When comparing a value of type `enum todo_command` with a value that is > outside the defined enum constants, clang greets the developer with this > warning: > > comparison of constant 2 with expression of type > '

Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 03:36:40PM +0100, Andreas Schwab wrote: > On Nov 09 2016, Johannes Schindelin wrote: > > > The reason why we do not ignore kill errors is that we want to make sure > > that the script *actually ran*. Otherwise, the thing we need to test here > > does not necessarily get t

Re: [PATCH v1 03/19] split-index: add {add,remove}_split_index() functions

2016-11-09 Thread Christian Couder
On Wed, Nov 9, 2016 at 10:24 AM, Duy Nguyen wrote: > On Mon, Nov 7, 2016 at 5:08 PM, Duy Nguyen wrote: >> On Sun, Oct 30, 2016 at 5:06 AM, Christian Couder >> wrote: >>> On Tue, Oct 25, 2016 at 11:58 AM, Duy Nguyen wrote: On Sun, Oct 23, 2016 at 4:26 PM, Christian Couder wrote: >

Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-09 Thread Andreas Schwab
On Nov 09 2016, Johannes Schindelin wrote: > The reason why we do not ignore kill errors is that we want to make sure > that the script *actually ran*. Otherwise, the thing we need to test here > does not necessarily get tested. That can be tested by looking for the pid file. Andreas. -- Andr

[PATCH] sequencer: shut up clang warning

2016-11-09 Thread Johannes Schindelin
When comparing a value of type `enum todo_command` with a value that is outside the defined enum constants, clang greets the developer with this warning: comparison of constant 2 with expression of type 'const enum todo_command' is always true While this is arguably true *iff* the

Re: [PATCH] sequencer: silence -Wtautological-constant-out-of-range-compare

2016-11-09 Thread Johannes Schindelin
Hi Peff, On Tue, 8 Nov 2016, Jeff King wrote: > diff --git a/sequencer.c b/sequencer.c > index 5fd75f30d..6f0ff9e41 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -629,7 +629,7 @@ static const char *todo_command_strings[] = { > > static const char *command_to_string(const enum todo_comman

Re: Bug: git config does not respect read-only .gitconfig file

2016-11-09 Thread Jonathan Word
> It is unreasonable to drop the write-enable bit of > a file in a writable directory and expect it to stay unmodified. The > W-bit on the file is not usable as a security measure, and we do not > use it as such. The point here is not a matter of security - it is of expectations. When a user drop

[PATCH] t6026: ensure that long-running script really is

2016-11-09 Thread Johannes Schindelin
When making sure that background tasks are cleaned up in 5babb5b (t6026-merge-attr: clean up background process at end of test case, 2016-09-07), we considered to let the background task sleep longer, just to be certain that it will still be running when we want to kill it after the test. Sadly, t

Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-09 Thread Johannes Schindelin
Hi On Tue, 8 Nov 2016, Jeff King wrote: > On Tue, Nov 08, 2016 at 06:03:04PM +0100, Andreas Schwab wrote: > > > Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end > > of test case") added a kill command to clean up after the test, but this > > can fail if the sleep command

Re: [PATCH 0/3] gitk: memory consumption improvements

2016-11-09 Thread Markus Hitter
Am 08.11.2016 um 22:37 schrieb Junio C Hamano: > Are all semi-modern Tcl/Tk in service have this -undo thing so that > we can pass unconditionally to the text widget like the patch does? Good point. As far as my research goes, this flag was introduced in Nov. 2001: http://core.tcl.tk/tk/info/5265

Re: [PATCH 5/6] config docs: Provide for config to specify tags not to abbreviate

2016-11-09 Thread Ian Jackson
Junio C Hamano writes ("Re: [PATCH 5/6] config docs: Provide for config to specify tags not to abbreviate"): > And I do not think we would want "log" or any core side Porcelain > command to have too many "information losing" options like this > "truncate refnames down to a point where it is no lon

Re: [PATCH v1 1/2] config.mak.in: set NO_OPENSSL and APPLE_COMMON_CRYPTO for macOS >10.11

2016-11-09 Thread Torsten Bögershausen
On 09.11.16 10:29, Lars Schneider wrote: > >> On 09 Nov 2016, at 09:18, Torsten Bögershausen wrote: >> >> On 07.11.16 18:26, Jeff King wrote: >>> On Sun, Nov 06, 2016 at 08:35:04PM +0100, Lars Schneider wrote: >>> Good point. I think I found an even easier way to achieve the same. What

Re: [PATCHv2 32/36] pathspec: allow querying for attributes

2016-11-09 Thread Duy Nguyen
On Sat, Oct 29, 2016 at 1:54 AM, Stefan Beller wrote: > The pathspec mechanism is extended via the new > ":(attr:eol=input)pattern/to/match" syntax to filter paths so that it > requires paths to not just match the given pattern but also have the > specified attrs attached for them to be chosen. >

Re: [PATCH 32/36] pathspec: allow querying for attributes

2016-11-09 Thread Duy Nguyen
On Fri, Oct 28, 2016 at 1:29 AM, Junio C Hamano wrote: > The reason why I am bringing this up in this discussion thread on > this patch is because I wonder if we would benefit by a similar > "let's not do too involved things and be cheap by erring on the safe > and lazy side" strategy in the call

Re: [PATCH v1 1/2] config.mak.in: set NO_OPENSSL and APPLE_COMMON_CRYPTO for macOS >10.11

2016-11-09 Thread Lars Schneider
> On 09 Nov 2016, at 09:18, Torsten Bögershausen wrote: > > On 07.11.16 18:26, Jeff King wrote: >> On Sun, Nov 06, 2016 at 08:35:04PM +0100, Lars Schneider wrote: >> >>> Good point. I think I found an even easier way to achieve the same. >>> What do you think about the patch below? >>> >>> [..

Re: [PATCH v1 03/19] split-index: add {add,remove}_split_index() functions

2016-11-09 Thread Duy Nguyen
On Mon, Nov 7, 2016 at 5:08 PM, Duy Nguyen wrote: > On Sun, Oct 30, 2016 at 5:06 AM, Christian Couder > wrote: >> On Tue, Oct 25, 2016 at 11:58 AM, Duy Nguyen wrote: >>> On Sun, Oct 23, 2016 at 4:26 PM, Christian Couder >>> wrote: +void remove_split_index(struct index_state *istate) +

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Duy Nguyen
On Wed, Nov 9, 2016 at 5:21 AM, Jeff King wrote: > On Tue, Nov 08, 2016 at 08:38:55AM +0700, Duy Nguyen wrote: > >> > Another approach is to have a config option to disallow symlinks to >> > destinations outside of the repository tree (I'm not sure if it should >> > be on or off by default, though

[PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

2016-11-09 Thread Nguyễn Thái Ngọc Duy
There are occasions when you decide to abort an in-progress rebase and move on to do something else but you forget to do "git rebase --abort" first. Or the rebase has been in progress for so long you forgot about it. By the time you realize that (e.g. by starting another rebase) it's already too la

Re: Forbid access to /gitweb but authorize the sub projets

2016-11-09 Thread Dennis Kaarsemaker
On Mon, 2016-11-07 at 14:07 +0100, Alexandre Duplaix wrote: > Hello, > > I have several projects under https://myserver/gitweb and I would like > to forbid the access to the root, so that the users can't list the > differents projects. > > However, I need to let the access to the sub projects (

Re: [PATCH v1 1/2] config.mak.in: set NO_OPENSSL and APPLE_COMMON_CRYPTO for macOS >10.11

2016-11-09 Thread Torsten Bögershausen
On 07.11.16 18:26, Jeff King wrote: > On Sun, Nov 06, 2016 at 08:35:04PM +0100, Lars Schneider wrote: > >> Good point. I think I found an even easier way to achieve the same. >> What do you think about the patch below? >> >> [...] >> >> diff --git a/Makefile b/Makefile >> index 9d6c245..f53fcc9 10