Re: git -C has unexpected behaviour

2016-11-06 Thread Felix Nairz
Hi guys, thanks for the answer and the clarification. >From what you are saying I can see that this expects as designed. It's confusing in the submodule case, but I get you don't want to add extra rules which slow down performance and mess with other people at the same time. I will look into the

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

2016-11-06 Thread Jacob Keller
On Sun, Nov 6, 2016 at 5:18 PM, Josh Triplett wrote: > Once we have gitrefs, you have both alternatives: reachable (gitref) or > not reachable (gitlink). > > However, if you want some way to mark reachable objects as not > reachable, such as for a sparse checkout, external large-object storage, >

Re: gitk: avoid obscene memory consumption

2016-11-06 Thread Paul Mackerras
On Sun, Nov 06, 2016 at 11:28:37AM +0100, Markus Hitter wrote: > > Thanks for the positive comments. > > TBH, the more I think about the problem, the less I'm satisfied with the > solution I provided. Including two reasons: > > - The list of files affected to the right is still complete and cli

Re: [PATCH (optional)] t0021: use arithmetic expansion to trim whitespace from wc -c output

2016-11-06 Thread Lars Schneider
> On 06 Nov 2016, at 20:31, Johannes Sixt wrote: > > Am 06.11.2016 um 16:45 schrieb Lars Schneider: >> >>> On 03 Nov 2016, at 21:22, Johannes Sixt wrote: >>> This is a pure optimization that reduces the number of forks, which >>> helps a bit on Windows. >>> >>> There would be a solution with

2.11.0-rc1 will not be tagged for a few days

2016-11-06 Thread Junio C Hamano
I regret to report that I won't be able to tag 2.11-rc1 as scheduled in tinyurl.com/gitCal (I am feverish and my brain is not keeping track of things correctly) any time soon. I'll report back an updated schedule when able. I'd appreciate that people keep discussing and exchanging patches that wi

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

2016-11-06 Thread Josh Triplett
On Sun, Nov 06, 2016 at 12:17:10PM -0800, Jacob Keller wrote: > On Sun, Nov 6, 2016 at 9:33 AM, Josh Triplett wrote: > > On Sun, Nov 06, 2016 at 09:14:56AM -0800, Junio C Hamano wrote: > >> Josh Triplett writes: > >> > We could, but if we (or one of the many third-party git implementations) > >>

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

2016-11-06 Thread Lars Schneider
> On 17 Oct 2016, at 02:25, larsxschnei...@gmail.com wrote: > > From: Lars Schneider > > TravisCI changed their default macOS image from 10.10 to 10.11 [1]. > Unfortunately the HTTPD tests do not run out of the box using the > pre-installed Apache web server anymore. Therefore we enable these >

Re: [PATCH] t0021: expect more variations in the output of uniq -c

2016-11-06 Thread Johannes Sixt
Am 06.11.2016 um 16:31 schrieb Lars Schneider: This looks good to me. I wonder if I should post a patch to add the "|| return" trick to the following function "test_cmp_exclude_clean", too?! The function does this: for FILE in "$expect" "$actual" do grep -v "IN:

Re: gitk: avoid obscene memory consumption

2016-11-06 Thread Jacob Keller
On Sun, Nov 6, 2016 at 2:28 AM, Markus Hitter wrote: > - Storing only the actually viewed diff. It's an interactive tool, so there's > no advantage in displaying the diff in 0.001 seconds over viewing it in 0.1 > seconds. As far as I can see, Gitk currently stores every diff it gets a hold > of

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

2016-11-06 Thread Jacob Keller
On Sun, Nov 6, 2016 at 9:33 AM, Josh Triplett wrote: > On Sun, Nov 06, 2016 at 09:14:56AM -0800, Junio C Hamano wrote: >> Josh Triplett writes: >> > We could, but if we (or one of the many third-party git implementations) >> > miss a case, gitlinks+reachability may appear to work in many cases wi

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

2016-11-06 Thread Lars Schneider
> On 17 Oct 2016, at 11:50, Jeff King wrote: > > On Sun, Oct 16, 2016 at 05:25:49PM -0700, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> Apple removed the OpenSSL header files in macOS 10.11 and above. OpenSSL >> was deprecated since macOS 10.7. >> >> Set `NO_OPENSSL` and `

Re: [PATCH (optional)] t0021: use arithmetic expansion to trim whitespace from wc -c output

2016-11-06 Thread Johannes Sixt
Am 06.11.2016 um 16:45 schrieb Lars Schneider: > >> On 03 Nov 2016, at 21:22, Johannes Sixt wrote: >> This is a pure optimization that reduces the number of forks, which >> helps a bit on Windows. >> >> There would be a solution with perl that does not require trimming >> of whitespace, but perl

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

2016-11-06 Thread Josh Triplett
On Sun, Nov 06, 2016 at 09:14:56AM -0800, Junio C Hamano wrote: > Josh Triplett writes: > > We could, but if we (or one of the many third-party git implementations) > > miss a case, gitlinks+reachability may appear to work in many cases with > > dataloss afterward, while gitrefs will fail early an

Re: [PATCH v1 12/19] Documentation/config: add splitIndex.maxPercentChange

2016-11-06 Thread Junio C Hamano
Christian Couder writes: > I think it is easier for user to be able to just set core.splitIndex > to true to enable split-index. You can have that exact benefit by making core.splitIndex to bool-or-more. If your default is 20%, take 'true' as if the user specified 20% and take 'false' as if the

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

2016-11-06 Thread Junio C Hamano
Josh Triplett writes: > We could, but if we (or one of the many third-party git implementations) > miss a case, gitlinks+reachability may appear to work in many cases with > dataloss afterward, while gitrefs will fail early and not appear > functional. I wonder what happens if we do not introduc

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

2016-11-06 Thread Josh Triplett
On Sat, Nov 05, 2016 at 09:50:07PM -0700, Jacob Keller wrote: > On Sat, Nov 5, 2016 at 1:25 PM, Josh Triplett wrote: > > On Sat, Nov 05, 2016 at 09:21:58PM +0100, Christian Couder wrote: > >> On Sat, Nov 5, 2016 at 4:18 PM, Josh Triplett > >> wrote: > >> > On Sat, Nov 05, 2016 at 01:45:27PM +010

Re: [PATCH (optional)] t0021: use arithmetic expansion to trim whitespace from wc -c output

2016-11-06 Thread Lars Schneider
> On 03 Nov 2016, at 21:22, Johannes Sixt wrote: > > Instead of a pipeline with sed and a useless use of cat, return the > unmodified text of wc -c from function file_size, but substitute the > result with arithmetic expansion to get rid of the leading whitespace > that some version of wc -c pri

Re: [PATCH] t0021: expect more variations in the output of uniq -c

2016-11-06 Thread Lars Schneider
> On 03 Nov 2016, at 21:12, Johannes Sixt wrote: > > Some versions of uniq -c write the count left-justified, other version > write it right-justified. Be prepared for both kinds. > > Signed-off-by: Johannes Sixt > --- > Here it is as a proper patch. > > Am 03.11.2016 um 01:41 schrieb Lars Sc

Re: [PATCH 4/4] t0021: fix filehandle usage on older perl

2016-11-06 Thread Lars Schneider
> On 02 Nov 2016, at 19:23, Jeff King wrote: > > The rot13-filter.pl script calls methods on implicitly > defined filehandles (STDOUT, and the result of an open() > call). Prior to perl 5.13, these methods are not > automatically loaded, and perl will complain with: > > Can't locate object me

Re: [PATCH 3/4] t0021: use $PERL_PATH for rot13-filter.pl

2016-11-06 Thread Jeff King
On Sun, Nov 06, 2016 at 03:52:00PM +0100, Lars Schneider wrote: > Would it make sense to rename "rot13-filter.pl" to > "rot13-filter.pl.template" or something because of the > missing shebang? I think it makes sense to keep it as ".pl". Without the "#!" things like editors will use the extension

Re: [PATCH 3/4] t0021: use $PERL_PATH for rot13-filter.pl

2016-11-06 Thread Lars Schneider
> On 02 Nov 2016, at 19:20, Jeff King wrote: > > The rot13-filter.pl script hardcodes "#!/usr/bin/perl", and > does not respect $PERL_PATH at all. That is a problem if the > system does not have perl at that path, or if it has a perl > that is too old to run a complicated script like the > rot13

Re: [PATCH 1/4] t0021: use write_script to create rot13 shell script

2016-11-06 Thread Lars Schneider
> On 06 Nov 2016, at 15:29, Jeff King wrote: > > On Sun, Nov 06, 2016 at 03:25:33PM +0100, Lars Schneider wrote: > >> This looks good to me (and it works on my machine). >> However, I took a look at the "write_script" function and found this, >> added by Junio in 840c519d: >> >> echo "#!${2-"$

Re: [PATCH 2/4] t0021: put $TEST_ROOT in $PATH

2016-11-06 Thread Lars Schneider
> On 02 Nov 2016, at 19:18, Jeff King wrote: > > We create a rot13.sh script in the trash directory, but need > to call it by its full path when we have moved our cwd to > another directory. Let's just put $TEST_ROOT in our $PATH so > that the script is always found. > > This is a minor conveni

Re: [PATCH 1/4] t0021: use write_script to create rot13 shell script

2016-11-06 Thread Jeff King
On Sun, Nov 06, 2016 at 03:25:33PM +0100, Lars Schneider wrote: > This looks good to me (and it works on my machine). > However, I took a look at the "write_script" function and found this, > added by Junio in 840c519d: > > echo "#!${2-"$SHELL_PATH"}" && > > There is some kind of variable expans

Re: [PATCH 1/4] t0021: use write_script to create rot13 shell script

2016-11-06 Thread Lars Schneider
> On 02 Nov 2016, at 19:17, Jeff King wrote: > > This avoids us fooling around with $SHELL_PATH and the > executable bit ourselves. > > Signed-off-by: Jeff King > --- > t/t0021-conversion.sh | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/t/t0021-conversion.sh b/t/t

Re: [PATCH v5 08/27] sequencer: completely revamp the "todo" script parsing

2016-11-06 Thread Lars Schneider
> On 21 Oct 2016, at 14:24, Johannes Schindelin > wrote: > > When we came up with the "sequencer" idea, we really wanted to have > kind of a plumbing equivalent of the interactive rebase. Hence the > choice of words: the "todo" script, a "pick", etc. > > ... > > Signed-off-by: Johannes Schind

Re: gitk: avoid obscene memory consumption

2016-11-06 Thread Markus Hitter
Am 05.11.2016 um 12:08 schrieb Paul Mackerras: > On Fri, Nov 04, 2016 at 03:45:09PM -0700, Stefan Beller wrote: >> On Fri, Nov 4, 2016 at 12:49 PM, Markus Hitter wrote: >>> >>> Hello all, >> >> +cc Paul Mackeras, who maintains gitk. > > Thanks. > >>> >>> after Gitk brought my shabby development

Re: [PATCH v2 1/6] submodules: add helper functions to determine presence of submodules

2016-11-06 Thread Jacob Keller
On Tue, Nov 1, 2016 at 10:31 AM, Stefan Beller wrote: > On Tue, Nov 1, 2016 at 10:20 AM, Junio C Hamano wrote: > >> >> Maybe I am old fashioned, but I'd feel better to see these with >> explicit "extern" in front (check the older header files like >> cache.h when you are in doubt what the project