[PATCH v3 0/2] range-diff: doc + regression fix

2018-11-07 Thread Ævar Arnfjörð Bjarmason
) fixes the regression & adds a test. I did try various other diff options and they all seem to work. Ævar Arnfjörð Bjarmason (2): range-diff doc: add a section about output stability range-diff: fix regression in passing along diff options Documentation/git-range-diff.txt

[PATCH v3 1/2] range-diff doc: add a section about output stability

2018-11-07 Thread Ævar Arnfjörð Bjarmason
-by: Ævar Arnfjörð Bjarmason --- Documentation/git-range-diff.txt | 17 + 1 file changed, 17 insertions(+) diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt index f693930fdb..bbd07a9be8 100644 --- a/Documentation/git-range-diff.txt +++ b/Documentation

[PATCH v3 2/2] range-diff: fix regression in passing along diff options

2018-11-07 Thread Ævar Arnfjörð Bjarmason
bet/ for a further explanation of the regression. The quoting of "EOF" here mirrors that of an earlier test. Perhaps that should be fixed, but let's leave that up to a later cleanup change. Signed-off-by: Ævar Arnfjörð Bjarmason --- range-diff.c | 3 ++- t/t3206-range-diff.sh | 30

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Nguyễn Thái Ngọc Duy wrote: > OK here is a less constroversal attempt to add new trailers. Instead > of changing the default behavior (which could be done incrementally > later), this patch simply adds a new option --append-trailer to revert > and cherry-pick. > > Both will

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 9:57 AM Ævar Arnfjörð Bjarmason > wrote: >> Leaving aside the question of whether the pain of switching is worth it, >> I think it's a worthwihle to consider if we could stop hardcoding one >> specific

[PATCH v2] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
ion-factor tweak for --range-diff", 2018-07-22). See [1] and related E-Mails for a discussion about that. 1. https://public-inbox.org/git/87d0ri7gbs@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- Range-diff: 1: 6e735e991c ! 1: fe4e251f26 range-diff: add a --no-pat

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Johannes Schindelin wrote: > Hi, > > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, Nov 05 2018, Eric Sunshine wrote: >> >> > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason >> > wrote: >> >>

Re: Checkout deleted semi-untracked file

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Steffen Jost wrote: > Hello! > > A brief discussion on the git user mailing list on Google Groups recommended > me to file the following as a bug report. > > The problem led to an actual file loss, but I suspect that this might be > intended: > > 1) .gitignore is added to

Regression in rebase-in-C with rebase.autoStash=true

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Johannes Schindelin via GitGitGadget wrote: > Johannes Schindelin (2): > rebase --autostash: demonstrate a problem with dirty submodules > rebase --autostash: fix issue with dirty submodules > > builtin/rebase.c| 2 +- > t/t3420-rebase-autostash.sh | 10

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 04 2018, Nguyễn Thái Ngọc Duy wrote: > When a commit is reverted (or cherry-picked with -x) we add an English > sentence recording that commit id in the new commit message. Make > these real trailer lines instead so that they are more friendly to > parsers (especially "git

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Eric Sunshine wrote: > On Mon, Nov 5, 2018 at 11:17 PM Junio C Hamano wrote: >> Ævar Arnfjörð Bjarmason writes: >> > This change doesn't update git-format-patch with a --no-patch >> > option. That can be added later similar to how format-patch

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-05 Thread Ævar Arnfjörð Bjarmason
On Mon, Nov 05 2018, Eric Sunshine wrote: > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason > wrote: >> Add a --no-patch option which shows which changes got removed, added >> or moved etc., without showing the diff associated with them. > > This option e

[PATCH] range-diff: add a --no-patch option to show a summary

2018-11-05 Thread Ævar Arnfjörð Bjarmason
ion-factor tweak for --range-diff", 2018-07-22). I don't see why anyone would want this for format-patch, it pretty much defeats the point of range-diff. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-range-diff.txt | 4 +++ builtin/log.c| 2 +- builti

Re: [RFC v1] Add virtual file system settings and hook proc

2018-11-05 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 04 2018, Duy Nguyen wrote: > On Wed, Oct 31, 2018 at 9:53 PM Ben Peart wrote: >> >> +core.virtualFilesystem:: >> >> + If set, the value of this variable is used as a command which >> >> + will identify all files and directories that are present in >> >> + the

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

2018-11-05 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 04 2018, brian m. carlson wrote: > SHA-1 is weak and we need to transition to a new hash function. For > some time, we have referred to this new function as NewHash. Recently, > we decided to pick SHA-256 as NewHash. The reasons behind the choice of > SHA-256 are outlined in the

Re: [RFC/PATCH 0/5] stop installing old libexec aliases like "git-init"

2018-11-05 Thread Ævar Arnfjörð Bjarmason
On Sat, Nov 03 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Although I'm on the fence with the approach in 1/5. Should this be a >> giant getopt switch statement like that in a helper script? >> >> An alternative would be to write out a shel

Re: [PATCH v3 7/8] push: add DWYM support for "git push refs/remotes/...:"

2018-11-05 Thread Ævar Arnfjörð Bjarmason
I'll re-roll this. Hopefully sooner than later. I'll leave out the later part of this series as it's more controversial and we can discuss that later on its own. Meanwhile just some replies to this (while I remember): > Ævar Arnfjörð Bjarmason writes: > >>> On the other hand, I

Re: [PATCH v5 01/12] sha1-file: rename algorithm to "sha1"

2018-11-04 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 04 2018, brian m. carlson wrote: > The transition plan anticipates us using a syntax such as "^{sha1}" for > disambiguation. Since this is a syntax some people will be typing a > lot, it makes sense to provide a short, easy-to-type syntax. Omitting > the dash doesn't create any

Re: [PATCH v3] commit: add a commit.allowEmpty config variable

2018-11-03 Thread Ævar Arnfjörð Bjarmason
On Sat, Nov 03 2018, tanushree27 wrote: > +commit.allowEmpty:: > + A boolean to specify whether empty commits are allowed with `git > + commit`. See linkgit:git-commit[1]. > + Defaults to false. > + Good. > + if (config_commit_allow_empty >= 0) /* if allowEmpty is allowed in

[RFC/PATCH 0/5] stop installing old libexec aliases like "git-init"

2018-11-02 Thread Ævar Arnfjörð Bjarmason
bit of a try and gave up in the Makefile jungle. Ævar Arnfjörð Bjarmason (5): Makefile: move long inline shell loops in "install" into helper Makefile: conform some of the code to our coding standards Makefile: stop hiding failures during "install&quo

[RFC/PATCH 2/5] Makefile: conform some of the code to our coding standards

2018-11-02 Thread Ævar Arnfjörð Bjarmason
This code is still very much unlike our usual style since it was lifted from the Makefile, but we can at least make some of it use the usual style and line spacing. Signed-off-by: Ævar Arnfjörð Bjarmason --- install_programs | 28 +--- 1 file changed, 17 insertions

[RFC/PATCH 5/5] Makefile: Add a NO_INSTALL_BUILTIN_EXECDIR_ALIASES flag

2018-11-02 Thread Ævar Arnfjörð Bjarmason
re, so the "NO_CROSS_DIRECTORY_HARDLINKS" flag becomes redundant under this new option. 1. https://public-inbox.org/git/87woyfdkoi....@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 8 install_programs | 36 +---

[RFC/PATCH 3/5] Makefile: stop hiding failures during "install"

2018-11-02 Thread Ævar Arnfjörð Bjarmason
ase and NO_INSTALL_HARDLINKS=YesPlease, it doesn't make sense anymore to not only implicitly fall back to copying, but to do so silently. This change leaves no way to not get errors spewed if we're trying and failing to e.g. make symlinks and having to fall back on "cp"

[RFC/PATCH 4/5] Makefile: add NO_INSTALL_SYMLINKS_FALLBACK switch

2018-11-02 Thread Ævar Arnfjörð Bjarmason
And know for sure that there's not going to be any silent fallbacks on hardlinks or copying of files if symlinking fails. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 5 install_programs | 69 2 files changed, 51 insertions(+), 23

[RFC/PATCH 1/5] Makefile: move long inline shell loops in "install" into helper

2018-11-02 Thread Ævar Arnfjörð Bjarmason
ertainly didn't help. The shell code is ported pretty much as-is (with getopts added), it'll be fixed & prettified in subsequent commits. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 52 install_programs | 89 +

Re: ab/* topics

2018-11-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 01 2018, Duy Nguyen wrote: > On Thu, Nov 1, 2018 at 3:04 PM Junio C Hamano wrote: >> >> Ævar Arnfjörð Bjarmason writes: >> >> > Could you please pick up >> > https://public-inbox.org/git/20181024114725.3927-1-ava...@gmail.com/ ? >>

[PATCH v3] i18n: make GETTEXT_POISON a runtime option

2018-11-01 Thread Ævar Arnfjörð Bjarmason
tps://public-inbox.org/git/871s8gd32p@evledraar.gmail.com/ 2. https://public-inbox.org/git/87woq7b58k@evledraar.gmail.com/ 3. https://public-inbox.org/git/878t2pd6yu@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- Now: * The new i18n helper is gone. We just use &quo

Re: ab/* topics (was: Re: What's cooking in git.git (Nov 2018, #01; Thu, 1))

2018-11-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 01 2018, SZEDER Gábor wrote: > On Thu, Nov 01, 2018 at 12:02:01PM +0100, Ævar Arnfjörð Bjarmason wrote: >> Could you please pick up >> https://public-inbox.org/git/20181024114725.3927-1-ava...@gmail.com/ ? >> It seems to have fallen between the cracks and a

Re: [RFE] Please add name and email to git credentials

2018-11-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 01 2018, Nicolas Mailhot wrote: > Le jeudi 01 novembre 2018 à 12:22 +0100, Ævar Arnfjörð Bjarmason a > écrit : >> >> Where would we get an E-Mail to lookup to pass to the helper? Are you >> just asking that the helper git the result of $(git config user.

Re: [RFE] Please add a standard ref object to releases

2018-11-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 01 2018, Nicolas Mailhot wrote: > Le jeudi 01 novembre 2018 à 12:15 +0100, Ævar Arnfjörð Bjarmason a > écrit : >> >> For both this and your other report, it would be helpful if you >> describe >> in concrete terms (with examples of git commands, or UI

Re: [RFE] Please add name and email to git credentials

2018-11-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 01 2018, Nicolas Mailhot wrote: > A dev persona is not just a username, please add email (and probably > also name) support to git credentials so the correct set for a repo url > is automatically picked up by git The "git-credential" helper needs to look at a URL like

Re: [RFE] Please add a standard ref object to releases

2018-11-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 01 2018, Nicolas Mailhot wrote: > git makes no provision for versioned release references. > > However, software projects need versioned releases. Software project > integrators need versionned releases. Security auditors need versioned > release. Software project users need

ab/* topics (was: Re: What's cooking in git.git (Nov 2018, #01; Thu, 1))

2018-11-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 01 2018, Junio C Hamano wrote: > * ab/push-dwim-dst (2018-10-29) 9 commits > - SQUASH??? > - push doc: document the DWYM behavior pushing to unqualified > - push: add DWYM support for "git push refs/remotes/...:" > - push: test that doesn't DWYM if is unqualified > - push:

Re: [RFC] Generation Number v2

2018-10-31 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 30 2018, Junio C Hamano wrote: > Derrick Stolee writes: >> In contrast, maximum generation numbers and corrected commit >> dates both performed quite well. They are frequently the top >> two performing indexes, and rarely significantly different. >> >> The trade-off here now seems

[PATCH 3/3] tests: add a special test setup that runs "git fsck" before exiting

2018-10-31 Thread Ævar Arnfjörð Bjarmason
wild" test coverage will be spotty, so we need all the help we can get. 1. https://public-inbox.org/git/878t2fkxrn@evledraar.gmail.com/ 2. https://public-inbox.org/git/20181030232312.gb32...@sigill.intra.peff.net/ Signed-off-by: Ævar Arnfjörð Bjarmason --- t/README

[PATCH 1/3] tests: add a "env-bool" helper to test-tool

2018-10-31 Thread Ævar Arnfjörð Bjarmason
storically we've used "test -n" for many of these). So let's add this helper so we can expose the same environment variable behavior without exposing the implementation detail of whether that variable happens to be checked in C or shellscript. Signed-off-by: Ævar Arnfjörð Bjar

[PATCH 0/3] Add a GIT_TEST_FSCK test mode

2018-10-31 Thread Ævar Arnfjörð Bjarmason
t as noted in 3/3 I think it's worth it to stress test fsck like this. I'll be adding this to my regular build. Ævar Arnfjörð Bjarmason (3): tests: add a "env-bool" helper to test-tool tests: mark those tests where "git fsck" fails at the end tests: add a special test set

[PATCH 2/3] tests: mark those tests where "git fsck" fails at the end

2018-10-31 Thread Ævar Arnfjörð Bjarmason
_FSCK=true during bisect. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t1006-cat-file.sh | 5 + t/t1305-config-include.sh | 4 t/t1404-update-ref-errors.sh| 4 t/t1410-reflog.sh | 4 t/t1515-rev-parse-outsi

Re: Infinite loop regression in git-fsck in v2.12.0

2018-10-30 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 30 2018, Ævar Arnfjörð Bjarmason wrote: > The test is easy, just add a 'git fsck' at the end of t5000-tar-tree.sh, > but more generally it seems having something like GIT_TEST_FSCK=true is > a good idea. We do a bunch of stress testing of the object store in the >

Infinite loop regression in git-fsck in v2.12.0

2018-10-30 Thread Ævar Arnfjörð Bjarmason
While playing around with having a GIT_TEST_FSCK=true as I suggested in https://public-inbox.org/git/20181030184331.27264-3-ava...@gmail.com/ I found that we've had an infinite loop in git-fsck since c68b489e56 ("fsck: parse loose object paths directly", 2017-01-13) In particular in the while()

[PATCH v2 0/3] index-pack: test updates

2018-10-30 Thread Ævar Arnfjörð Bjarmason
I'd still probalby like to have core.checkCollisions as a config knob to be able to turn it off, but let's see what Jeff comes up with once he finishes his WIP cache patch. In the meantime 1-3/4 of my series is obviously correct test fixes which I'd like queued up first. Ævar Arnfjörð Bjarmason

[PATCH v2 1/3] pack-objects test: modernize style

2018-10-30 Thread Ævar Arnfjörð Bjarmason
012-05-24) which had copied the style of the first two. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t5300-pack-object.sh | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 6c620cd540..a0309e4bab

[PATCH v2 2/3] pack-objects tests: don't leave test .git corrupt at end

2018-10-30 Thread Ævar Arnfjörð Bjarmason
suite to run a "git fsck" at the very end (in "test_done"). That would have errored before this change, and may find other issues #leftoverbits. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t5300-pack-object.sh | 37 - 1 file changed, 20 insert

[PATCH v2 3/3] index-pack tests: don't leave test repo dirty at end

2018-10-30 Thread Ævar Arnfjörð Bjarmason
a "fetch" that fails will write to the local object store, so let's copy the bit-error test directory before running this test. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t1060-object-corruption.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t1060-object-

Re: commit-graph is cool (overcoming add_missing_tags() perf issues)

2018-10-30 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 17, 2018 at 8:41 PM Elijah Newren wrote: > (And in the mean time I gave the user a one-liner to nuke his > local-only tags that I suspect he doesn't need.) Just a note that you can usually set 'fetch.pruneTags=true' these days to make that happen.

Re: [RFC PATCH] index-pack: improve performance on NFS

2018-10-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 29 2018, Jeff King wrote: > On Sat, Oct 27, 2018 at 01:22:16PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > Taking one step back, the root problem in this thread is that stat() on >> > non-existing files is slow (which makes has_sha1_file slow)

Re: [RFC PATCH] index-pack: improve performance on NFS

2018-10-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 29 2018, Jeff King wrote: > On Mon, Oct 29, 2018 at 09:48:02AM +0900, Junio C Hamano wrote: > >> > Of course any cache raises questions of cache invalidation, but I think >> > we've already dealt with that for this case. When we use >> > OBJECT_INFO_QUICK, that is a sign that we

Re: [PATCH 12/12] fsck: mark strings for translation

2018-10-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 29 2018, Ævar Arnfjörð Bjarmason wrote: > On Mon, Oct 29 2018, Duy Nguyen wrote: > >> On Mon, Oct 29, 2018 at 3:09 PM Junio C Hamano wrote: >>> >>> SZEDER Gábor writes: >>> >>> >> -fprintf(stderr, "%s in %s

Re: [PATCH 12/12] fsck: mark strings for translation

2018-10-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 29 2018, Duy Nguyen wrote: > On Mon, Oct 29, 2018 at 3:09 PM Junio C Hamano wrote: >> >> SZEDER Gábor writes: >> >> >> -fprintf(stderr, "%s in %s %s: %s\n", >> >> -msg_type, printable_type(obj), describe_object(obj), err); >> >> +fprintf_ln(stderr, _("%s in %s

Re: [PATCH] wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode

2018-10-29 Thread Ævar Arnfjörð Bjarmason
On Sat, Oct 27 2018, Nguyễn Thái Ngọc Duy wrote: > In WM_PATHNAME mode (or FNM_PATHNAME), '*' does not match '/' and '**' > can but only in three patterns: > > - '**/' matches zero or more leading directories > - '/**/' matches zero or more directories in between > - '/**' matches zero or more

Re: [PATCH v3 7/8] push: add DWYM support for "git push refs/remotes/...:"

2018-10-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 29 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Add DWYM support for pushing a ref in refs/remotes/* when the > > I think most people call it do-what-*I*-mean, not do-what-you-mean. FWIW I picked this up from the perl list where both

Re: [PATCH v3 7/8] push: add DWYM support for "git push refs/remotes/...:"

2018-10-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 29 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> This is the first use of the %N$ style of printf format in >> the *.[ch] files in our codebase. It's supported by POSIX[2] and >> there's existing uses for it in po/*.po files,...

[PATCH 2/4] pack-objects tests: don't leave test .git corrupt at end

2018-10-28 Thread Ævar Arnfjörð Bjarmason
suite to run a "git fsck" at the very end (in "test_done"). That would have errored before this change, and may find other issues #leftoverbits. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t5300-pack-object.sh | 37 - 1 file changed, 20 insert

[PATCH 4/4] index-pack: add ability to disable SHA-1 collision check

2018-10-28 Thread Ævar Arnfjörð Bjarmason
lt. Also add a "GIT_TEST_CHECK_COLLISIONS" setting so the entire test suite can be exercised with the collision check turned off. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 68 builtin/index-pack.c | 7 ++-- ca

[PATCH 0/4] index-pack: optionally turn off SHA-1 collision checking

2018-10-28 Thread Ævar Arnfjörð Bjarmason
t this new core.checkCollisions option. But maybe I'm wrong about that and Geert is happy to just turn on core.checkCollisions=false and use this series instead. Ævar Arnfjörð Bjarmason (4): pack-objects test: modernize style pack-objects tests: don't leave test .git corrupt at end index-pack te

[PATCH 3/4] index-pack tests: don't leave test repo dirty at end

2018-10-28 Thread Ævar Arnfjörð Bjarmason
a "fetch" that fails will write to the local object store, so let's copy the bit-error test directory before running this test. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t1060-object-corruption.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t1060-object-

[PATCH 1/4] pack-objects test: modernize style

2018-10-28 Thread Ævar Arnfjörð Bjarmason
012-05-24) which had copied the style of the first two. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t5300-pack-object.sh | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 6c620cd540..a0309e4bab

Re: [RFC PATCH] index-pack: improve performance on NFS

2018-10-27 Thread Ævar Arnfjörð Bjarmason
On Sat, Oct 27 2018, Jeff King wrote: > On Sat, Oct 27, 2018 at 04:26:50PM +0900, Junio C Hamano wrote: > >> Ævar Arnfjörð Bjarmason writes: >> >> > But as Junio notes the devil's in the details, another one I thought of >> > is: >> > >> &g

Re: [PATCH] i18n: make GETTEXT_POISON a runtime option

2018-10-27 Thread Ævar Arnfjörð Bjarmason
On Sat, Oct 27 2018, Jeff King wrote: > On Fri, Oct 26, 2018 at 09:20:56PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> >> I was thinking: >> >> >> >> $ git var -e GIT_WHATEVER_ENV >> >> >> >> [-e for environment

[PATCH v3 3/8] push: improve the error shown on unqualified push

2018-10-26 Thread Ævar Arnfjörð Bjarmason
o let's not confuse the two. While I'm at it, add a "TRANSLATORS" comment since the message has gotten more complex and it's not as clear what the two %s's refer to. 1. https://public-inbox.org/git/20181010205505.gb12...@sigill.intra.peff.net/ 2. https://public-inbox.org/git/xmqqbm81lb7c.

[PATCH v3 4/8] push: move unqualified refname error into a function

2018-10-26 Thread Ævar Arnfjörð Bjarmason
ANSLATORS" comment. Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 38 ++ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/remote.c b/remote.c index f4b438ff74..c7a0b9c46f 100644 --- a/remote.c +++ b/remote.c @@ -1005,6 +1005,26

[PATCH v3 8/8] push doc: document the DWYM behavior pushing to unqualified

2018-10-26 Thread Ævar Arnfjörð Bjarmason
to this new documentation from the existing documentation we had (added in bb9fca80ce). Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-push.txt | 27 +++ 1 file changed, 27 insertions(+) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index

[PATCH v3 6/8] push: test that doesn't DWYM if is unqualified

2018-10-26 Thread Ævar Arnfjörð Bjarmason
-push: Update description of refspecs and add examples", 2007-06-09) and f8aae12034 ("push: allow unqualified dest refspecs to DWIM", 2008-04-23) which are most relevant commits that have changed or documented the behavior of this feature in the past. Signed-off-by: Ævar Arnfjör

[PATCH v3 5/8] push: add an advice on unqualified push

2018-10-26 Thread Ævar Arnfjörð Bjarmason
, but is required to correctly mark the messages for translation. See the discussion in <87r2gxebsi@evledraar.gmail.com> about that. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 7 +++ advice.c | 2 ++ advice.h |

[PATCH v3 7/8] push: add DWYM support for "git push refs/remotes/...:"

2018-10-26 Thread Ævar Arnfjörð Bjarmason
f the refspec. 1. https://public-inbox.org/git/87zi1jxjqn@evledraar.gmail.com/ 2. http://pubs.opengroup.org/onlinepubs/7908799/xsh/fprintf.html Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 20 +++- t/t5505-remote.sh | 14 +- 2 files changed, 28 in

[PATCH v3 1/8] remote.c: add braces in anticipation of a follow-up change

2018-10-26 Thread Ævar Arnfjörð Bjarmason
use braces. This is not currently needed, but a follow-up change will add a new multi-line condition to that logic. Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/remote.c b/remote.c index 81f4f01b00..18cae48

[PATCH v3 2/8] i18n: remote.c: mark error(...) messages for translation

2018-10-26 Thread Ævar Arnfjörð Bjarmason
passes when running the tests with GIT_GETTEXT_POISON=1 (after building with GETTEXT_POISON). Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/remote.c b/remote.c index 18cae48daa..5cb3d00bfb 1

[PATCH v3 0/8] fixes for unqualified push

2018-10-26 Thread Ævar Arnfjörð Bjarmason
for translators than to have a 3rd argument to the function identical to the 2nd, by re-using the 2nd -: -- > 8: bc171b0312 push doc: document the DWYM behavior pushing to unqualified Ævar Arnfjörð Bjarmason (8): remote.c: add braces in anticipation of a follo

Re: [RFC PATCH] index-pack: improve performance on NFS

2018-10-26 Thread Ævar Arnfjörð Bjarmason
On Fri, Oct 26 2018, Junio C Hamano wrote: > "Jansen, Geert" writes: > >> The index-pack command determines if a sha1 collision test is needed by >> checking the existence of a loose object with the given hash. In my tests, I >> can improve performance of “git clone” on Amazon EFS by 8x when

[PATCH v2 7/7] push: add DWYM support for "git push refs/remotes/...:"

2018-10-26 Thread Ævar Arnfjörð Bjarmason
it's clear that we're continuing to talk about the part of the refspec. 1. https://public-inbox.org/git/87zi1jxjqn@evledraar.gmail.com/ 2. http://pubs.opengroup.org/onlinepubs/7908799/xsh/fprintf.html Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 20 +++- t

[PATCH v2 5/7] push: add an advice on unqualified push

2018-10-26 Thread Ævar Arnfjörð Bjarmason
that. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 7 +++ advice.c | 2 ++ advice.h | 1 + remote.c | 37 + t/t5505-remote.sh| 25 + 5 files changed, 72

[PATCH v2 3/7] push: improve the error shown on unqualified push

2018-10-26 Thread Ævar Arnfjörð Bjarmason
o let's not confuse the two. While I'm at it, add a "TRANSLATORS" comment since the message has gotten more complex and it's not as clear what the two %s's refer to. 1. https://public-inbox.org/git/20181010205505.gb12...@sigill.intra.peff.net/ 2. https://public-inbox.org/git/xmqqbm81lb7c.

[PATCH v2 6/7] push: test that doesn't DWYM if is unqualified

2018-10-26 Thread Ævar Arnfjörð Bjarmason
-push: Update description of refspecs and add examples", 2007-06-09) and f8aae12034 ("push: allow unqualified dest refspecs to DWIM", 2008-04-23) which are most relevant commits that have changed or documented the behavior of this feature in the past. Signed-off-by: Ævar Arnfjör

[PATCH v2 4/7] push: move unqualified refname error into a function

2018-10-26 Thread Ævar Arnfjörð Bjarmason
ANSLATORS" comment. Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 38 ++ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/remote.c b/remote.c index f4b438ff74..c7a0b9c46f 100644 --- a/remote.c +++ b/remote.c @@ -1005,6 +1005,26

[PATCH v2 2/7] i18n: remote.c: mark error(...) messages for translation

2018-10-26 Thread Ævar Arnfjörð Bjarmason
passes when running the tests with GIT_GETTEXT_POISON=1 (after building with GETTEXT_POISON). Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/remote.c b/remote.c index 18cae48daa..5cb3d00bfb 1

[PATCH v2 1/7] remote.c: add braces in anticipation of a follow-up change

2018-10-26 Thread Ævar Arnfjörð Bjarmason
use braces. This is not currently needed, but a follow-up change will add a new multi-line condition to that logic. Signed-off-by: Ævar Arnfjörð Bjarmason --- remote.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/remote.c b/remote.c index 81f4f01b00..18cae48

[PATCH v2 0/7] fixes for unqualified push

2018-10-26 Thread Ævar Arnfjörð Bjarmason
This has grown to a 7-part series for v2 (from 2 patches). This addresse all the feedback for v1 and then some. Ævar Arnfjörð Bjarmason (7): remote.c: add braces in anticipation of a follow-up change i18n: remote.c: mark error(...) messages for translation push: improve the error shown

Re: [PATCH] i18n: make GETTEXT_POISON a runtime option

2018-10-26 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 25 2018, Jeff King wrote: > On Thu, Oct 25, 2018 at 02:24:41AM +0100, Ramsay Jones wrote: > >> >> Yeah, my thinko. The latter would be closer to what this patch >> >> wants to have, but obviously the former would be more flexible and >> >> useful in wider context. Both have the

Re: [PATCH 2/2] push: add an advice on unqualified push

2018-10-26 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 11 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> On Wed, Oct 10 2018, Jeff King wrote: >> >>> This is much better, and I love the customized behavior based on the >>> object type. >>> >>> I wonder if w

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

2018-10-26 Thread Ævar Arnfjörð Bjarmason
On Fri, Oct 26 2018, Jeff King wrote: > On Sat, Oct 20, 2018 at 02:58:53PM -0400, Jeff King wrote: > >> On Sat, Oct 20, 2018 at 01:14:28PM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> > > I'd guess this sort of thing is pretty rare. But I wonder if we're >

Re: the opposite of .gitignore, whitelist

2018-10-26 Thread Ævar Arnfjörð Bjarmason
On Fri, Oct 26 2018, Jeff King wrote: > On Thu, Oct 25, 2018 at 10:38:46AM -0400, Jason Cooper wrote: > >> On 10/25/18 1:37 AM, Junio C Hamano wrote: >> > "lhf...@163.com" writes: >> > >> >> I have a good idea, add a file to git that is the opposite of >> >> .gitignore..., >> > Do negative

Re: 'ds/test-multi-pack-index' vs. 'ab/commit-graph-progress'

2018-10-25 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 25 2018, SZEDER Gábor wrote: > when branch 'ds/test-multi-pack-index' is merged with > 'ab/commit-graph-progress', IOW 'master', 'next', or 'pu', > 'GIT_TEST_MULTI_PACK_INDEX=1 ./t6500-gc.sh' fails with: > > expecting success: > git -c gc.writeCommitGraph=true gc

Re: [PATCH] Poison gettext with the Ook language

2018-10-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 24 2018, Duy Nguyen wrote: > On Tue, Oct 23, 2018 at 6:45 PM Ævar Arnfjörð Bjarmason > wrote: >> >> The effect of what I'm suggesting here, and which my WIP patch in >> >> <875zxtd59e@evledraar.gmail.com> implements is that we'd do a >

[PATCH v2] i18n: make GETTEXT_POISON a runtime option

2018-10-24 Thread Ævar Arnfjörð Bjarmason
. https://public-inbox.org/git/20181024074400.ga31...@sigill.intra.peff.net/ Signed-off-by: Ævar Arnfjörð Bjarmason --- On Wed, Oct 24 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Notes on the implementation: >> >> * The only reason we need a new &qu

[PATCH] i18n: make GETTEXT_POISON a runtime option

2018-10-23 Thread Ævar Arnfjörð Bjarmason
the simpler test_set_prereq. See also https://public-inbox.org/git/871s8gd32p@evledraar.gmail.com/ for more discussion. 1. https://public-inbox.org/git/871s8gd32p@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- On Mon, Oct 22 2018, Junio C Hamano wrote: > Ævar Arnfjörð B

Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Ben Peart wrote: > On 10/23/2018 5:13 AM, Ævar Arnfjörð Bjarmason wrote: >> >> On Wed, Oct 17 2018, Jeff King wrote: >> >>> On Wed, Oct 17, 2018 at 02:19:59PM -0400, Eric Sunshine wrote: >>> >>>> On Wed, O

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Duy Nguyen wrote: > On Tue, Oct 23, 2018 at 12:17 PM Ævar Arnfjörð Bjarmason > wrote: >> >> >> On Tue, Oct 23 2018, Johannes Schindelin wrote: >> >> > Hi Ævar, >> > >> > On Mon, 22 Oct 2018, Ævar Arnfjörð Bjarm

Re: [PATCH] Poison gettext with the Ook language

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Johannes Schindelin wrote: > Hi Ævar, > > On Mon, 22 Oct 2018, Ævar Arnfjörð Bjarmason wrote: > >> So I think the only reason to keep it [GETTEXT_POISON] compile-time is >> performance, but I don't think that matters. It's not like we'

Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting

2018-10-23 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 17 2018, Jeff King wrote: > On Wed, Oct 17, 2018 at 02:19:59PM -0400, Eric Sunshine wrote: > >> On Wed, Oct 17, 2018 at 12:40 PM Ben Peart wrote: >> > Add a reset.quietDefault config setting that sets the default value of the >> > --quiet flag when running the reset command. This

Re: [PATCH] Poison gettext with the Ook language

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

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

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

Re: [PATCH] Poison gettext with the Ook language

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

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

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

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

2018-10-20 Thread Ævar Arnfjörð Bjarmason
On Sat, Oct 20 2018, Duy Nguyen wrote: > On Sat, Oct 20, 2018 at 9:25 PM Ævar Arnfjörð Bjarmason > wrote: >> And sometimes like in the case of git-gc(1) we have gc.* config >> documented in two places with different prose that needs to be updated >> in two places in

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

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

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

2018-10-20 Thread Ævar Arnfjörð Bjarmason
On Sat, Oct 20 2018, Jeff King wrote: > On Sat, Oct 20, 2018 at 01:14:28PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > I'd guess this sort of thing is pretty rare. But I wonder if we're >> > crossing the line of trying to assume too much about what the user's

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

2018-10-20 Thread Ævar Arnfjörð Bjarmason
On Fri, Oct 19 2018, Jeff King wrote: > On Thu, Oct 18, 2018 at 10:57:39PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Add detection for aliasing loops in cases where one of the aliases >> re-invokes git as a shell command. This catches cases like: >> >>

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

2018-10-20 Thread Ævar Arnfjörð Bjarmason
On Fri, Oct 19 2018, Jeff King wrote: > On Fri, Oct 19, 2018 at 10:28:22AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > - string_list_append(_list, *argv[0]); >> > + add_cmd_history(, _list, *argv[0]); >> > >> >

Mirror of git.git on gitlab.com

2018-10-19 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 18 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >>> sites could do the same polling and mirroring. I am just too lazy >>> to open a new account at yet another hosting site to add that for >>> loop, but I may choose to when

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

2018-10-19 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 18 2018, Ævar Arnfjörð Bjarmason wrote: > +static void init_cmd_history(struct strbuf *env, struct string_list > *cmd_list) > +{ > + const char *old = getenv(COMMAND_HISTORY_ENVIRONMENT); > + struct strbuf **cmd_history, **ptr; > + > +

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