[PATCH v3 3/3] githooks.txt: Minor improvements to the grammar & phrasing

2016-04-25 Thread Ævar Arnfjörð Bjarmason
s/parameter/parameters/ when the plural made more sense. Most of this goes all the way back to the initial introduction of hooks.txt in v0.99.5-76-g6d35cc7 by Junio. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 34 +-

Re: [PATCH v2] hooks: Add ability to specify where the hook directory is

2016-04-25 Thread Ævar Arnfjörð Bjarmason
On Sun, Apr 24, 2016 at 11:18 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > Change the hardcoded lookup for .git/hooks/* to optionally lookup in > $(git config core.hooksPath)/* instead. > > This is essentially a more intrusive version of the git-init ability to >

Re: git-scm.org bug: Broken link in git-push documentation

2016-04-24 Thread Ævar Arnfjörð Bjarmason
On Sun, Apr 24, 2016 at 9:58 PM, Matthieu Moy wrote: > Ęvar Arnfjörš Bjarmason writes: > >> I couldn't find a way to report git-scm.org-specific bugs > > You can do so here: > > https://github.com/git/git-scm.com/issues Thanks. I didn't find that,

[PATCH 3/3] githooks.txt: Minor improvements to the grammar & phrasing

2016-04-24 Thread Ævar Arnfjörð Bjarmason
s/parameter/parameters/ when the plural made more sense. Most of this goes all the way back to the initial introduction of hooks.txt in v0.99.5-76-g6d35cc7 by Junio. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 34 +-

[PATCH 2/3] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-04-24 Thread Ævar Arnfjörð Bjarmason
, and remove the mention of the advice originating on the mailing list, the users reading this don't care where the idea came up. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff

[PATCH 1/3] githooks.txt: Improve the intro section

2016-04-24 Thread Ævar Arnfjörð Bjarmason
of git-init in those cases, and move some of this documentation into git-init's documentation about the default templates. * We briefly note in the intro that hooks can get their arguments in various different ways, and that how exactly is described below for each hook. Signed-o

git-scm.org bug: Broken link in git-push documentation

2016-04-24 Thread Ævar Arnfjörð Bjarmason
I couldn't find a way to report git-scm.org-specific bugs, but I guess whoever maintains it these days also reads the list. Here: https://git-scm.com/docs/git-push#OPTIONS If you click on the "GIT URLS" link it's broken. If you search for "urls.txt" in the document you can see that this is

[PATCH v2] hooks: Add ability to specify where the hook directory is

2016-04-24 Thread Ævar Arnfjörð Bjarmason
that should be run centrally via a unified dispatch mechanism. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- This is based off the githooks.txt series I just sent, I thought it made the most sense to address the questions the previous version raised about how we treat the w

[PATCH] hooks: Add ability to specify where the hook directory is

2016-04-22 Thread Ævar Arnfjörð Bjarmason
like to manage all the hooks that should be run centrally via a unified dispatch mechanism. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 10 ++ Documentation/githooks.txt| 5 - cache.h

RFC: Supporting .git/hooks/$NAME.d/* && /etc/git/hooks/$NAME.d/*

2016-04-22 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 23, 2016 at 1:33 AM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > Change the hardcoded lookup for .git/hooks/* to optionally lookup in > $(git config core.hooksDirectory)/* instead if that config key is set. I think this'll do for my use-case, but I started with a

Re: [PATCH] hooks: Add ability to specify where the hook directory is

2016-04-22 Thread Ævar Arnfjörð Bjarmason
epositories, or all repositories on the >> system. >> >> I plan on using this on a centralized Git server where users can create >> arbitrary repositories under /gitroot, but I'd like to manage all the >> hooks that should be run centrally via a unified dispatch mechan

Re: Is there a "git reset --keep || git reset --hard " alternative?

2016-04-20 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 20, 2016 at 9:03 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> $ ls -l INSTALL ; chmod 600 INSTALL ; git reset --hard @{u} ; ls -l >> INSTALL >> -rw-r--r-- 1 avar avar 9147 Apr

Re: RFC: Supporting .git/hooks/$NAME.d/* && /etc/git/hooks/$NAME.d/*

2016-04-26 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 25, 2016 at 7:45 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> The reason for supporting the *.d directories was that I spotted a lot >> of hooks people had hacked up at work using the pee(1)

Re: [PATCH 3/3] githooks.txt: Minor improvements to the grammar & phrasing

2016-04-26 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 25, 2016 at 8:33 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> -This hook is invoked by 'git am' script. It takes a single >> +This hook is invoked by 'git am'. It takes a single > > Good,

[PATCH v2 2/3] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-04-24 Thread Ævar Arnfjörð Bjarmason
, and remove the mention of the advice originating on the mailing list, the users reading this don't care where the idea came up. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- > "by just using not executing the hook." Yeah that made no sense. Fixed in this version. Documen

[PATCH v4 4/4] hooks: Add ability to specify where the hook directory is

2016-04-26 Thread Ævar Arnfjörð Bjarmason
that should be run centrally via a unified dispatch mechanism. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 18 ++ Documentation/githooks.txt | 12 cache.h | 1 + config.c

[PATCH v4 3/4] githooks.txt: Minor improvements to the grammar & phrasing

2016-04-26 Thread Ævar Arnfjörð Bjarmason
s/parameter/parameters/ when the plural made more sense. Most of this goes all the way back to the initial introduction of hooks.txt in v0.99.5-76-g6d35cc7 by Junio. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 32

[PATCH v4 1/4] githooks.txt: Improve the intro section

2016-04-26 Thread Ævar Arnfjörð Bjarmason
of git-init in those cases, and move some of this documentation into git-init's documentation about the default templates. * We briefly note in the intro that hooks can get their arguments in various different ways, and that how exactly is described below for each hook. Signed-o

[PATCH v4 2/4] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-04-26 Thread Ævar Arnfjörð Bjarmason
, and remove the mention of the advice originating on the mailing list, the users reading this don't care where the idea came up. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Documen

Re: [PATCH 1/3] githooks.txt: Improve the intro section

2016-04-26 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 25, 2016 at 8:23 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Change the documentation so that: >> >> * We don't talk about "little scripts". Hooks can be as big as you >>

[PATCH v4 0/4] githooks.txt improvements + core.hooksDirectory

2016-04-26 Thread Ævar Arnfjörð Bjarmason
and the core.hooksDirectory patch into one series. Although they're logically different things I think it makes more sense to combine them for ease of reading, since the core.hooksDirectory documentation refers to some documentation I fixed earlier in the series. Ævar Arnfjörð Bjarmason (4): githooks.txt: Improve

Re: [PATCH 2/3] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-04-26 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 25, 2016 at 8:29 PM, Junio C Hamano wrote: > Jacob Keller writes: > >>> -Another use suggested on the mailing list is to use this hook to >>> -implement access control which is finer grained than the one >>> -based on filesystem group. >>>

Re: [PATCH v2] hooks: Add ability to specify where the hook directory is

2016-04-26 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 25, 2016 at 10:33 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> +core.hooksPath:: >> + By default Git will look for your hooks in the >> + '$GIT_DIR/hooks' directory. Set this to dif

Re: RFC: Supporting .git/hooks/$NAME.d/* && /etc/git/hooks/$NAME.d/*

2016-04-26 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 26, 2016 at 3:40 PM, Marc Branchaud <marcn...@xiplink.com> wrote: > On 2016-04-26 06:58 AM, Ævar Arnfjörð Bjarmason wrote: >> >> Makes sense to have an experimental.* config tree for git for stuff like >> this. > > I disagree. > > * If the p

Re: [PATCH v2] hooks: Add ability to specify where the hook directory is

2016-04-26 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 26, 2016 at 9:16 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >>>> +The path can either be absolute or relative. In the latter case see >>>> +the discussion in the "DESCRIPTION&q

Re: [PATCH 6/6] upload-pack: provide a hook for running pack-objects

2016-05-19 Thread Ævar Arnfjörð Bjarmason
On Thu, May 19, 2016 at 12:45 AM, Jeff King wrote: > 3. You may want to insert a caching layer around > pack-objects; it is the most CPU- and memory-intensive > part of serving a fetch, and its output is a pure > function[1] of its input, making it an ideal place

Re: [PATCH 6/6] upload-pack: provide a hook for running pack-objects

2016-05-19 Thread Ævar Arnfjörð Bjarmason
On Thu, May 19, 2016 at 2:08 PM, Jeff King <p...@peff.net> wrote: > On Thu, May 19, 2016 at 12:12:43PM +0200, Ævar Arnfjörð Bjarmason wrote: >> But as you point out this makes the hook interface a bit unusual. >> Wouldn't this give us the same security and normalize

Re: [PATCH 05/21] i18n: sequencer: mark entire sentences for translation

2016-05-21 Thread Ævar Arnfjörð Bjarmason
On Wed, May 18, 2016 at 11:02 PM, Vasco Almeida wrote: > Às 19:28 de 18-05-2016, Eric Sunshine escreveu: >> On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida >> wrote: >>> Mark entire sentences of error message rather than assembling one using >>>

Re: [PATCH 14/21] i18n: rebase-interactive: mark strings for translation

2016-05-21 Thread Ævar Arnfjörð Bjarmason
On Wed, May 18, 2016 at 5:27 PM, Vasco Almeida wrote: > Mark strings in git-rebase--interactive.sh for translation. There is no > need to source git-sh-i18n since git-rebase.sh already does so. Cool, thanks for working on this. > --- a/git-rebase--interactive.sh > +++

Re: [RFD PATCH 0/3] Free all the memory!

2016-05-18 Thread Ævar Arnfjörð Bjarmason
On Tue, May 17, 2016 at 7:58 PM, Stefan Beller wrote: > On Mon, May 16, 2016 at 8:41 PM, Eric Sunshine > wrote: >> On Mon, May 16, 2016 at 11:22 PM, Stefan Beller wrote: >>> When using automated tools to find memory leaks, it is

Re: What's cooking in git.git (May 2016, #01; Tue, 3)

2016-05-04 Thread Ævar Arnfjörð Bjarmason
On Wed, May 4, 2016 at 12:49 AM, Junio C Hamano wrote: > * ab/hooks (2016-04-26) 4 commits > - hooks: allow customizing where the hook directory is > - githooks.txt: minor improvements to the grammar & phrasing > - githooks.txt: amend dangerous advice about 'update' hook ACL

Re: [PATCH v16 0/7] config commit verbose

2016-05-06 Thread Ævar Arnfjörð Bjarmason
On Fri, May 6, 2016 at 6:16 PM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > [+cc:git@vger.kernel.org] Because its an interesting fact to be shared > which isn't covered elsewhere. > > On Fri, May 6, 2016 at 2:53 AM, Ævar Arnfjörð Bjarmason > <ava...@gmail.com> wrote

[PATCH v6 0/4] githooks.txt improvements + core.hooksDirectory

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Changed to reflect Junio's latest comment, diff between the whole series and the last one here at the end (made with -U0). Ævar Arnfjörð Bjarmason (4): githooks.txt: Improve the intro section githooks.txt: Amend dangerous advice about 'update' hook ACL githooks.txt: Minor improvements

[PATCH v6 3/4] githooks.txt: Minor improvements to the grammar & phrasing

2016-05-04 Thread Ævar Arnfjörð Bjarmason
s/parameter/parameters/ when the plural made more sense. Most of this goes all the way back to the initial introduction of hooks.txt in v0.99.5-76-g6d35cc7 by Junio. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 32

[PATCH v6 1/4] githooks.txt: Improve the intro section

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-init.txt | 7 ++- Documentation/githooks.txt | 31 +++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt ind

[PATCH v6 4/4] hooks: Add ability to specify where the hook directory is

2016-05-04 Thread Ævar Arnfjörð Bjarmason
that should be run centrally via a unified dispatch mechanism. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 17 + Documentation/githooks.txt | 12 cache.h | 1 + config.c

[PATCH v6 2/4] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-05-04 Thread Ævar Arnfjörð Bjarmason
, and remove the mention of the advice originating on the mailing list, the users reading this don't care where the idea came up. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Documen

[PATCH v5 3/4] githooks.txt: Minor improvements to the grammar & phrasing

2016-05-04 Thread Ævar Arnfjörð Bjarmason
s/parameter/parameters/ when the plural made more sense. Most of this goes all the way back to the initial introduction of hooks.txt in v0.99.5-76-g6d35cc7 by Junio. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 32

Re: [PATCH v4 1/2] Documentation: fix linkgit references

2016-05-04 Thread Ævar Arnfjörð Bjarmason
On Wed, May 4, 2016 at 10:06 PM, Jeff King wrote: > Would: > > open(my $files, '-|', qw(git ls-files)); > while (<$files>) { > chomp; > ... > } > > make sense? Or a simpler but non-streaming spelling: > > my @files = map { chomp; $_ } `git ls-files`; As a minor

[PATCH v5 4/4] hooks: Add ability to specify where the hook directory is

2016-05-04 Thread Ævar Arnfjörð Bjarmason
that should be run centrally via a unified dispatch mechanism. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 17 + Documentation/githooks.txt | 12 cache.h | 1 + config.c

[PATCH v5 1/4] githooks.txt: Improve the intro section

2016-05-04 Thread Ævar Arnfjörð Bjarmason
Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-init.txt | 7 ++- Documentation/githooks.txt | 33 + 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt ind

[PATCH v5 2/4] githooks.txt: Amend dangerous advice about 'update' hook ACL

2016-05-04 Thread Ævar Arnfjörð Bjarmason
, and remove the mention of the advice originating on the mailing list, the users reading this don't care where the idea came up. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/githooks.txt | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Documen

[PATCH v5 0/4] githooks.txt improvements + core.hooksDirectory

2016-05-04 Thread Ævar Arnfjörð Bjarmason
a grammar error in a commit message. For convenience & ease of review a diff between the bits of v4 and v5 that I changed follows below. Ævar Arnfjörð Bjarmason (4): githooks.txt: Improve the intro section githooks.txt: Amend dangerous advice about 'update' hook ACL githooks.txt: Minor improv

Re: [PATCH v4 12/16] index-helper: kill mode

2016-04-16 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 13, 2016 at 2:33 AM, David Turner wrote: > Add a new command (and command-line arg) to allow index-helpers to > exit cleanly. > > This is mainly useful for tests. Both --kill and --autorun are missing documentation in Documentation/git-index-helper.txt. --

Is there a "git reset --keep || git reset --hard " alternative?

2016-04-20 Thread Ævar Arnfjörð Bjarmason
If you check out a git repository and chmod a checked-in file there there away from git defaults then "git reset --hard" will re-chmod it. The use-case for not having this happen is if you e.g. have some inotify thing or a stat() loop monitoring changes to the files, and you'd like them to fire

Re: [PATCH v16 0/7] config commit verbose

2016-05-07 Thread Ævar Arnfjörð Bjarmason
On Sat, May 7, 2016 at 7:32 AM, Jeff King wrote: > On Fri, May 06, 2016 at 08:33:15AM -0700, Junio C Hamano wrote: > >> > Then I replied: >> > >> >However, that doesn't mean that we have to spread this badly chosen >> >name from options to config variables, does it? I

Re: [PATCH] t5510: skip tests under GETTEXT_POISON build

2016-07-26 Thread Ævar Arnfjörð Bjarmason
On Tue, Jul 26, 2016 at 6:53 PM, Junio C Hamano wrote: > [...] Back when 5e9637c6 (i18n: add infrastructure for > translating Git with gettext, 2011-11-18) introduced the former, > test_have_prereq did not support a negated prerequisite, so the > commit added GETTEXT_POISON

Does anything document --date=tea/yesterday/noon/midnight/never/now etc.?

2016-07-29 Thread Ævar Arnfjörð Bjarmason
These were originally added by Linus back in v0.99.9-230-ga8aca41, a bit was added to them since then. See https://github.com/git/git/blob/v2.9.2/date.c#L927 The v0.99.9-214-g3c07b1d commit also has some info on the warty edge cases these have to deal with. I was checking what documented "git

Re: [PATCH] i18n: notes: mark comment for translation

2016-07-21 Thread Ævar Arnfjörð Bjarmason
On Thu, Jul 21, 2016 at 12:07 PM, Vasco Almeida wrote: > Mark comment displayed when editing a note for translation. I'm not sure, but wouldn't this make more sense: > Signed-off-by: Vasco Almeida > --- > builtin/notes.c | 4 ++-- > 1 file

Re: Git and SHA-1 security (again)

2016-07-18 Thread Ævar Arnfjörð Bjarmason
On Sat, Jul 16, 2016 at 3:48 PM, Herczeg Zsolt wrote: > I would like to discuss an old topic from 2006. I understand it was > already discussed. The only reason i'm sending this e-mail is to talk > about a possible solution which didn't show up on this list before. You mention

Re: Git and SHA-1 security (again)

2016-07-18 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 18, 2016 at 7:48 PM, Herczeg Zsolt wrote: >> In particular, as far as I know and as Theodore Ts'o's post describes >> better than I could[1], you seem to be confusing preimage attacks with >> collision attacks, and then concluding that because SHA1 is vulnerable >>

Re: Plugin mechanism(s) for Git?

2016-07-15 Thread Ævar Arnfjörð Bjarmason
On Fri, Jul 15, 2016 at 2:18 PM, Jeff King wrote: > Some features, like the index-helper, aren't quite so easy. One reason > is that its data needs to persist as a cache between multiple git > invocations. In general, I think it would be nice to solve that by > communicating via

Re: Server-side preventing some files from being overwritten

2016-07-15 Thread Ævar Arnfjörð Bjarmason
On Thu, Jul 14, 2016 at 8:44 PM, Junio C Hamano wrote: > On Thu, Jul 14, 2016 at 11:27 AM, Junio C Hamano wrote: >> Thorsten Glaser writes: >> >>> if test x"0" != x"$(comm -23z \ >>> <(git ls-tree -r -z "$old" "$subdir" |

Re: git alias for options

2017-02-17 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 17, 2017 at 9:42 PM, Jeff King <p...@peff.net> wrote: > On Fri, Feb 17, 2017 at 02:50:23PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> On Fri, Feb 17, 2017 at 9:23 AM, hIpPy <hippy2...@gmail.com> wrote: >> > Git has aliases for git commands. Is

Re: git alias for options

2017-02-17 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 17, 2017 at 9:23 AM, hIpPy wrote: > Git has aliases for git commands. Is there a (an inbuilt) way to alias > options? If not, what is the reason? This has long been on my wishlist, because there's a lot of copy/pasted logic all over Git to make git foo

[PATCH] gitweb tests: Skip tests when we don't have Time::HiRes

2017-02-27 Thread Ævar Arnfjörð Bjarmason
/bin/perl by default. Without this we'll hard fail the gitweb tests when trying to load the module. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/gitweb-lib.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index d5dab5a94f..116c

[PATCH] cvs tests: When root, skip tests that call "cvs commit"

2017-02-27 Thread Ævar Arnfjörð Bjarmason
n CentOS, 1.12.13-MirDebian-18 on Debian. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t9200-git-cvsexportcommit.sh | 5 + t/t9600-cvsimport.sh | 5 + 2 files changed, 10 insertions(+) diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportco

[PATCH v2 1/2] gitweb tests: Change confusing "skip_all" phrasing

2017-03-01 Thread Ævar Arnfjörð Bjarmason
Change the phrasing so that instead of saying that the CGI module is unusable, we say that it's not available. This came up on the git mailing list in <4b34e3a0-3da7-d821-2a7f-9a420ac1d...@gmail.com> from Jakub Narębski. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> -

[PATCH v2 0/2] Minor changes to skip gitweb tests without Time::HiRes

2017-03-01 Thread Ævar Arnfjörð Bjarmason
This was originally just one small patch, but Jakub Narębski pointed out that calling the module "unusable" when we failed to load it was confusing, so now the start of this series is just a rephrasing of an existing error message I copied. Ævar Arnfjörð Bjarmason (2): gitweb tes

Re: SHA1 collisions found

2017-02-26 Thread Ævar Arnfjörð Bjarmason
On Sun, Feb 26, 2017 at 8:11 PM, Linus Torvalds wrote: > But yes, SHA3-256 looks like the sane choice. Performance of hashing > is important in the sense that it shouldn't _suck_, but is largely > secondary. All my profiles on real loads (well, *my* real loads) have

Re: [ANNOUNCE] Git v2.12.0

2017-02-27 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 24, 2017 at 8:28 PM, Junio C Hamano wrote: > The latest feature release Git v2.12.0 is now available at the > usual places. It is comprised of 517 non-merge commits since > v2.11.0, contributed by 80 people, 24 of which are new faces. Yay, some explanations /

Re: [PATCH] gitweb tests: Skip tests when we don't have Time::HiRes

2017-02-27 Thread Ævar Arnfjörð Bjarmason
On Mon, Feb 27, 2017 at 6:48 PM, Jakub Narębski <jna...@gmail.com> wrote: > W dniu 27.02.2017 o 13:37, Ævar Arnfjörð Bjarmason pisze: >> Change the gitweb tests to skip when we can't load the Time::HiRes >> module. > > Could you tell us in the commit messag

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-09-02 Thread Ævar Arnfjörð Bjarmason
On Wed, Aug 31, 2016 at 5:05 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Ævar, > > On Wed, 31 Aug 2016, Ævar Arnfjörð Bjarmason wrote: > >> I haven't used it myself (or any Windows thing) but people say good >> things about http://strawberryperl

Re: Reducing CPU load on git server

2016-08-29 Thread Ævar Arnfjörð Bjarmason
On Sun, Aug 28, 2016 at 9:42 PM, W. David Jarvis wrote: > I've run into a problem that I'm looking for some help with. Let me > describe the situation, and then some thoughts. Just a few points that you may not have considered, and I didn't see mentioned in this

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-30 Thread Ævar Arnfjörð Bjarmason
On Mon, Aug 29, 2016 at 3:46 PM, Johannes Schindelin wrote: > While developing patch series, it is a good practice to run the test > suite from time to time, just to make sure that obvious bugs are caught > early. With complex patch series, it is common to run `make

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-30 Thread Ævar Arnfjörð Bjarmason
On Tue, Aug 30, 2016 at 10:51 PM, Jeff King <p...@peff.net> wrote: > On Tue, Aug 30, 2016 at 10:48:19PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > -failed: $(patsubst trash,,$(patsubst directory.%,%.sh,$(wildcard trash\ >> > directory.t[0-9]*))) >> &g

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-31 Thread Ævar Arnfjörð Bjarmason
On Wed, Aug 31, 2016 at 12:29 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Ævar, > > On Tue, 30 Aug 2016, Ævar Arnfjörð Bjarmason wrote: > >> On Tue, Aug 30, 2016 at 10:51 PM, Jeff King <p...@peff.net> wrote: >> > On Tue, Aug 30,

[PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Ævar Arnfjörð Bjarmason
d nothing in git's documentation mentioned that. That's bad, either we shouldn't support it at all, or we should document what it does. This patch does the latter. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 4 1 file changed, 4 in

[PATCH v2 3/3] gitweb: Link to "git describe"'d commits in log messages

2016-10-06 Thread Ævar Arnfjörð Bjarmason
k to "deadbeef"), and also allow us to be more aggressive in selecting candidate revisions. That may be too expensive to work in practice, or it may not. Investigating that would be a good follow-up to this patch. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- git

[PATCH v2 0/3] gitweb: Be smarter about linking to SHA1s in log messages

2016-10-06 Thread Ævar Arnfjörð Bjarmason
This is v2 of patches I sent on September 21st starting at <20160921114428.28664-1-ava...@gmail.com>. Jakub Narębski had a lot of feedback for that series (thanks!). Which as far as I can tell I've incorporated entirely in this re-roll. Ævar Arnfjörð Bjarmason (3): gitweb: Fix

[PATCH v2 2/3] gitweb: Link to 7-char+ SHA1s, not only 8-char+

2016-10-06 Thread Ævar Arnfjörð Bjarmason
ll-caps SHA1s, but didn't ever produce them as far as I can tell. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- gitweb/gitweb.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index cba7405..92b5e91 100755 -

[PATCH v2 1/3] gitweb: Fix a typo in a comment

2016-10-06 Thread Ævar Arnfjörð Bjarmason
Change a typo'd MIME type in a comment. The Content-Type is application/xhtml+xml, not application/xhtm+xml. Fixes up code originally added in 53c4031 ("gitweb: Strip non-printable characters from syntax highlighter output", 2011-09-16). Signed-off-by: Ævar Arnfjörð Bjarmason <ava

Re: Regression: git no longer works with musl libc's regex impl

2016-10-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 4, 2016 at 6:08 PM, Johannes Schindelin wrote: > As to making NO_REGEX conditional on REG_STARTEND: you are talking about > apples and oranges here. NO_REGEX is a Makefile flag, while REG_STARTEND > is a C preprocessor macro. > > Unless you can convince the

Re: [PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 6, 2016 at 2:13 PM, Matthieu Moy wrote: > Ęvar Arnfjörš Bjarmason writes: > >> That's bad, either we shouldn't support it at all, or we should >> document what it does. This patch does the latter. > > I vaguely remember a similar

Re: [PATCH v2 3/3] gitweb: Link to "git describe"'d commits in log messages

2016-10-09 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 6, 2016 at 9:51 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Change the log formatting function to know about "git describe" output >> such as "v2.8.0-4-g867ad08", in addit

[PATCH 1/3] gitweb: Fix an ancient typo in v1.7.7-rc1-1-g0866786

2016-09-21 Thread Ævar Arnfjörð Bjarmason
The Content-Type is application/xhtml+xml, not application/xhtm+xml. --- gitweb/gitweb.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 33d701d..9473daf 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1616,7

[PATCH 2/3] gitweb: Link to 7-character SHA1SUMS in commit messages

2016-09-21 Thread Ævar Arnfjörð Bjarmason
Change the minimum length of a commit we'll link to from 8 to 7. This arbitrary minimum length of 8 was introduced in v1.4.4.2-151-gbfe2191, but as seen in e.g. v1.7.4-1-gdce9648 the default abbreviation length is 7. It's still possible to reference SHA1s down to 4 characters in length, see

[PATCH 3/3] gitweb: Link to "git describe"'d commits in log messages

2016-09-21 Thread Ævar Arnfjörð Bjarmason
Change the log formatting function to know about "git describe" output like v2.8.0-4-g867ad08 in addition to just plain 867ad08. This also fixes a micro-regression in my change of the minimum SHA1 length from 8 to 7, which is that dated tags like hadoop-20160921-113441-20-g094fb7d would start

Re: [PATCH 1/3] gitweb: Fix an ancient typo in v1.7.7-rc1-1-g0866786

2016-09-21 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 21, 2016 at 3:33 PM, Jakub Narębski <jna...@gmail.com> wrote: > W dniu 21.09.2016 o 13:44, Ævar Arnfjörð Bjarmason napisał: > >> Subject: [PATCH 1/3] gitweb: Fix an ancient typo in v1.7.7-rc1-1-g0866786 > > It is more "ancient typo from v1.7.7-rc1-

Re: [PATCH 1/3] gitweb: Fix an ancient typo in v1.7.7-rc1-1-g0866786

2016-09-21 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 21, 2016 at 7:14 PM, Jakub Narębski <jna...@gmail.com> wrote: > W dniu 21.09.2016 o 16:17, Ævar Arnfjörð Bjarmason napisał: >> On Wed, Sep 21, 2016 at 3:33 PM, Jakub Narębski <jna...@gmail.com> wrote: >>> W dniu 21.09.2016 o 13:44, Æ

Re: [PATCH 2/3] gitweb: Link to 7-character SHA1SUMS in commit messages

2016-09-21 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 21, 2016 at 6:26 PM, Jakub Narębski wrote: > P.S. I have reworking of commit message parsing and enhancement in my > long, long and dated gitweb TODO list :-( Anything specific you could share? One thing that would be a lot faster in Perl is if we didn't have to

Re: [PATCH 3/3] gitweb: Link to "git describe"'d commits in log messages

2016-09-21 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 21, 2016 at 7:09 PM, Jakub Narębski <jna...@gmail.com> wrote: > W dniu 21.09.2016 o 13:44, Ævar Arnfjörð Bjarmason napisał: > >> Change the log formatting function to know about "git describe" output >> like v2.8.0-4-g867ad08 in addition to

Re: [PATCH 2/3] gitweb: Link to 7-character SHA1SUMS in commit messages

2016-09-21 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 21, 2016 at 8:28 PM, Jakub Narębski <jna...@gmail.com> wrote: > W dniu 21.09.2016 o 20:04, Ævar Arnfjörð Bjarmason pisze: >> It would make some code like git_print_log() a bit more complex / >> fragile, since it would have to work on multi-line strings, but &g

A couple of bugs / things TODO I encountered

2016-09-26 Thread Ævar Arnfjörð Bjarmason
I have these on my TODO list to look at at some point, but who knows when, meanwhile I thought I'd send them to the list if anyone's interested or wants to comment on them. = Inconsistent regexp usage: If you supply --perl-regexp to git-log it only applies to --grep. The documentation says

Re: [PATCH 4/4] core.abbrev: raise the default abbreviation to 12 hexdigits

2016-09-30 Thread Ævar Arnfjörð Bjarmason
On Fri, Sep 30, 2016 at 3:01 AM, Linus Torvalds wrote: > On Thu, Sep 29, 2016 at 5:56 PM, Mike Hommey wrote: >> >> OTOH, how often does one refer to trees or blobs with abbreviated sha1s? >> Most of the time, you'd use abbreviated sha1s for

Re: [PATCH v2 2/3] gitweb: Link to 7-char+ SHA1s, not only 8-char+

2016-10-15 Thread Ævar Arnfjörð Bjarmason
n tell. >> >> All right. If we decide to be more strict in what we accept, we can >> do it in a separate commit. >> >>> >>> Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> >> >> Acked-by: Jakub Narębski <jna...@gmail.com> > > Thanks

Re: [PATCH] git-sh-setup: Restore sourcability from outside scripts

2016-10-30 Thread Ævar Arnfjörð Bjarmason
,On Sun, Oct 30, 2016 at 10:12 PM, Jeff King wrote: > On Sun, Oct 30, 2016 at 08:09:21PM -, Philip Oakley wrote: > >> > It is documented (Documentation/git-sh-setup.txt), and this is not the >> > internal Documentation/technical section of the documentation, so my >> > default

Re: [PATCH] git-sh-setup: Restore sourcability from outside scripts

2016-10-30 Thread Ævar Arnfjörð Bjarmason
On Sun, Oct 30, 2016 at 3:10 AM, Anders Kaseorg wrote: > v2.10.0-rc0~45^2~2 “i18n: git-sh-setup.sh: mark strings for > translation” broke outside scripts such as guilt that source > git-sh-setup as described in the documentation: > > $ . "$(git --exec-path)/git-sh-setup" > sh: 6:

Re: Make `git fetch --all` parallel?

2016-10-11 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 12, 2016 at 12:59 AM, Jeff King wrote: > I'm not altogether convinced that parallel fetch would be that much > faster, though. I have local aliases to use GNU parallel for stuff like this, on my git.git which has accumulated 17 remotes: $ time parallel -j1 'git

Re: [PATCH v2 3/3] gitweb: Link to "git describe"'d commits in log messages

2016-10-14 Thread Ævar Arnfjörð Bjarmason
On Sun, Oct 9, 2016 at 1:20 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Thu, Oct 6, 2016 at 9:51 PM, Junio C Hamano <gits...@pobox.com> wrote: >> Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: >> >>> Change the log formatting fu

Re: [PATCH v2 2/3] gitweb: Link to 7-char+ SHA1s, not only 8-char+

2016-10-17 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 17, 2016 at 6:54 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> As far as I can tell the only outstanding "change this" is your >> s/SHA1/SHA-1/ in <xmqq37k9jm86@gitster.mtv.corp

Re: [PATCH v3 09/16] tag: add more incompatibles mode tests

2017-03-23 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 23, 2017 at 6:13 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Amend the test suite to test for more invalid uses like "-l -a" >> etc. This change tests this code path in builtin/

Re: [PATCH] branch doc: Change `git branch ` to use ``

2017-03-23 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 23, 2017 at 6:01 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Change an example for `git branch ` to say `git branch >> ` to be consistent with the synopsis. This changes >> documentation

Re: Bug: Revert with -m 0 says no -m was given

2017-03-23 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 23, 2017 at 7:15 PM, Junio C Hamano wrote: > Ulrik Sverdrup writes: > >> Git produces a misleading error when you tell it `git revert -m 0`. > > Thanks. > > I think this is the same issue as the one with 'cherry-pick' that > was reported

Re: [PATCH v3 12/16] tag: implicitly supply --list given another list-like option

2017-03-23 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 23, 2017 at 6:29 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt >> index 2640c6955c..491dba065c 100644 >> --- a/Documentatio

Re: [PATCH v3 09/16] tag: add more incompatibles mode tests

2017-03-23 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 23, 2017 at 10:36 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> On Thu, Mar 23, 2017 at 6:13 PM, Junio C Hamano <gits...@pobox.com> wrote: >>> Ævar Arnfjörð Bjarmason <ava...@gmail.

Re: [PATCH v2 08/16] for-each-ref: partly change to in help

2017-03-21 Thread Ævar Arnfjörð Bjarmason
On Tue, Mar 21, 2017 at 7:32 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Change mentions of to in the help output of >> for-each-ref as appropriate. >> >> Both --[no-]merged and --contains only

Re: [PATCH v2 15/16] tag: implicitly supply --list given the -n option

2017-03-21 Thread Ævar Arnfjörð Bjarmason
On Tue, Mar 21, 2017 at 8:24 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Yeah I see now that this is rather badly explained. I'll fix this up >> for v3. All of this worked already: >> >> $

Re: [PATCH] rev-parse: match @{u}, @{push} and ^{} case-insensitively

2017-03-21 Thread Ævar Arnfjörð Bjarmason
[Dropping Richard Hansen from CC, his E-Mail bounces, changed jobs probably...] On Sat, Mar 18, 2017 at 11:34 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > The new starts_with_case() function is a copy of the existing adjacent > starts_with(), just with a tolower()

Re: [PATCH v2 2/2] doc/SubmittingPatches: show how to get a CLI commit summary

2017-03-21 Thread Ævar Arnfjörð Bjarmason
On Tue, Mar 21, 2017 at 6:58 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >>> The "Copy commit summary" command of gitk can be used to obtain this >>> -format. >>> +format, or this invocation of "git show": >>> >>> +git show -s --date=short

<    1   2   3   4   5   6   7   8   9   10   >