Re: [PATCH 00/16] Consolidate reachability logic

Duy Nguyen writes: >> In other words: if you see something that you don't like about >> GitGitGadget, get your butts off the ground and contribute a fix. > > Thank you for the frank words. I will choose to not review any mails > coming from GitGitGadget. I wouldn't say I will choose not to, but

Re: [RFC] push: add documentation on push v2

On Wed, Jul 18, 2018 at 6:31 AM Derrick Stolee wrote: > > On 7/17/2018 7:25 PM, Stefan Beller wrote: > > On Tue, Jul 17, 2018 at 2:09 PM Brandon Williams wrote: > >> Signed-off-by: Brandon Williams > >> --- > >> > >> Since introducing protocol v2 and enabling fetch I've been thinking > >> about

Re: [PATCH 13/16] test-reach: test can_all_from_reach_with_flags

On 7/16/2018 5:54 PM, Stefan Beller wrote: On Mon, Jul 16, 2018 at 6:00 AM Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee The can_all_from_reach_with_flags method is used by ok_to_give_up in upload-pack.c to see if we have done enough negotiation during a fetch. This method is

Re: [PATCH 3/3] gc: do not return error for prior errors in daemonized mode

Jeff King writes: >> There's nothing for the calling program to act on on the basis of that >> error. Use status 0 consistently instead, to indicate that we decided >> not to run a gc (just like if no housekeeping was required). This >> way, repo and similar tools can get the benefit of the

Re: [PATCH 08/16] test-reach: create new test tool for ref_newer

On 7/16/2018 7:00 PM, Jonathan Tan wrote: To use the new test-tool, use 'test-tool reach ' and provide input to stdin that describes the inputs to the method. Currently, we only implement the ref_newer method, which requires two commits. Use lines "A:" and "B:" for the two inputs. We will expand

[PATCH v2 23/23] transport-helper.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t5801-remote-helpers.sh | 8 ++-- transport-helper.c| 87 --- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 88c7f158ef..e3bc53b0c7

[PATCH v2 13/23] environment.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- environment.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.c b/environment.c index 2a6de2330b..d129c4adc5 100644 --- a/environment.c +++ b/environment.c @@ -147,7 +147,7 @@ static char *expand_namespace(const char

[PATCH v2 21/23] sha1-file.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- sha1-file.c | 104 ++-- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/sha1-file.c b/sha1-file.c index ed7ac73fa9..92c27583db 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -378,8 +378,8 @@

[PATCH v2 22/23] transport.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- transport.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/transport.c b/transport.c index 9fcc33915a..516a83b7f6 100644 --- a/transport.c +++ b/transport.c @@ -139,7 +139,7 @@ static struct ref

[PATCH v2 18/23] refspec.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- refspec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refspec.c b/refspec.c index c66351743b..f529092fd6 100644 --- a/refspec.c +++ b/refspec.c @@ -134,7 +134,7 @@ void refspec_item_init_or_die(struct refspec_item *item, const char

[PATCH v2 04/23] builtin/config.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/config.c | 48 +-- t/t1308-config-set.sh | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index abb3195fa9..3c26df6c48 100644 ---

[PATCH v2 01/23] Update messages in preparation for i18n

Many messages will be marked for translation in the following commits. This commit updates some of them to be more consistent and reduce diff noise in those commits. Changes are - keep the first letter of die(), error() and warning() in lowercase - no full stop in die(), error() or warning() if

[PATCH v2 19/23] replace-object.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- replace-object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/replace-object.c b/replace-object.c index 801b5c1678..ddc1546b8c 100644 --- a/replace-object.c +++ b/replace-object.c @@ -17,7 +17,7 @@ static int

[PATCH v2 06/23] builtin/pack-objects.c: mark more strings for translation

Most of these are straight forward. GETTEXT_POISON does catch the last string in cmd_pack_objects(), but since this is --progress output, it's not supposed to be machine-readable. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 104 +

[PATCH v2 10/23] connect.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- connect.c | 78 +++ t/t5570-git-daemon.sh | 6 ++-- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/connect.c b/connect.c index 083cf804a7..70b97cfef6 100644 --- a/connect.c +++

[PATCH v2 20/23] sequencer.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- sequencer.c | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sequencer.c b/sequencer.c index 6b6162d194..f7c2f2422d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -716,7 +716,7 @@ static const char

[PATCH v2 05/23] builtin/grep.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/grep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/grep.c b/builtin/grep.c index 9774920999..58f941e951 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -489,7 +489,7 @@ static int grep_cache(struct grep_opt *opt,

[PATCH v2 03/23] archive-zip.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- archive-zip.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/archive-zip.c b/archive-zip.c index 48d843489c..7ad46d8854 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -309,11 +309,11 @@ static int

[PATCH v2 09/23] config.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- config.c | 72 +++ t/t1305-config-include.sh | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/config.c b/config.c index 6ba07989f1..58d076e833 100644 --- a/config.c +++

[PATCH v2 11/23] convert.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- convert.c | 38 -- t/t0021-conversion.sh | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/convert.c b/convert.c index f47e60022e..e53911d4f8 100644 --- a/convert.c +++ b/convert.c @@

[PATCH v2 14/23] exec-cmd.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- exec-cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exec-cmd.c b/exec-cmd.c index 02d31ee897..4f81f44310 100644 --- a/exec-cmd.c +++ b/exec-cmd.c @@ -358,7 +358,7 @@ int execl_git_cmd(const char *cmd, ...) }

[PATCH v2 15/23] object.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- object.c| 10 +- t/t1450-fsck.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/object.c b/object.c index 10d167825e..477e686da7 100644 --- a/object.c +++ b/object.c @@ -49,7 +49,7 @@ int

[PATCH v2 12/23] dir.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c| 6 +++--- t/t3005-ls-files-relative.sh | 4 ++-- t/t7400-submodule-basic.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dir.c b/dir.c index e1a2e1cffb..7c6e7a0a37 100644 --- a/dir.c +++ b/dir.c @@

[PATCH v2 17/23] refs.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c| 40 +-- t/t1400-update-ref.sh | 20 +++--- t/t1404-update-ref-errors.sh | 4 +-- t/t3210-pack-refs.sh | 2 +-

[PATCH v2 16/23] pkt-line.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- pkt-line.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkt-line.c b/pkt-line.c index 941e41dfc1..04d10bbd03 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -101,7 +101,7 @@ int packet_flush_gently(int fd) {

[PATCH v2 02/23] archive-tar.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- archive-tar.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index b6f58ddf38..68e72d9176 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -121,7 +121,7 @@ static int stream_blocked(const

[PATCH v2 00/23] Mark strings for translation

This series marks more strings for translation. It was done during the last rc period and probably misses new strings now, but we can mark more later. Compared to v1 [1], this moves interesting changes back to patch one and leave the boring _() to the remaining patches. I also cleaned up the "die

[PATCH v2 07/23] builtin/replace.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/replace.c | 74 +++ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 2d7abf7a43..c77b325aa1 100644 --- a/builtin/replace.c +++

[PATCH v2 08/23] commit-graph.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- commit-graph.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index b63a1fc85e..c8d521923c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -77,28 +77,28 @@ struct commit_graph

Re: [PATCH 06/16] upload-pack: generalize commit date cutoff

On 7/16/2018 3:38 PM, Stefan Beller wrote: On Mon, Jul 16, 2018 at 6:00 AM Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee The ok_to_give_up() method uses the commit date as a cutoff to avoid walking the entire reachble set of commits. Before moving the reachable() method to

[RFC PATCH] sequencer: fix quoting in write_author_script

From: Phillip Wood Single quotes should be escaped as \' not \\'. Note that this only affects authors that contain a single quote and then only external scripts that read the author script and users whose git is upgraded from the shell version of rebase -i while rebase was stopped. This is

[PATCH] DO-NOT-MERGE: write and read commit-graph always

This commit is not intended to be merged, but is only to create a test environment to see what works with the commit-graph feature and what does not. The tests that fail are primarily related to corrupting the object store to remove a commit from visibility and testing that rev-list fails --

[PATCH 5/8] commit-graph: not compatible with replace objects

From: Derrick Stolee Create new method commit_graph_compatible(r) to check if a given repository r is compatible with the commit-graph feature. Fill the method with a check to see if replace-objects exist. Test this interaction succeeds, including ignoring an existing commit-graph and failing to

[PATCH 7/8] commit-graph: not compatible with uninitialized repo

From: Derrick Stolee Signed-off-by: Derrick Stolee --- commit-graph.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/commit-graph.c b/commit-graph.c index 5097c7c12..233958e10 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -60,6 +60,9 @@ static struct commit_graph

[PATCH 8/8] commit-graph: close_commit_graph before shallow walk

From: Derrick Stolee Make close_commit_graph() work for arbitrary repositories. Call close_commit_graph() when about to start a rev-list walk that includes shallow commits. This is necessary in code paths that "fake" shallow commits for the sake of fetch. Specifically, test 351 in

[PATCH 4/8] test-repository: properly init repo

From: Derrick Stolee Signed-off-by: Derrick Stolee --- t/helper/test-repository.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c index 2762ca656..6a84a53ef 100644 --- a/t/helper/test-repository.c +++

[PATCH 6/8] commit-graph: not compatible with grafts

From: Derrick Stolee Augment commit_graph_compatible(r) to return false when the given repository r has commit grafts or is a shallow clone. Test that in these situations we ignore existing commit-graph files and we do not write new commit-graph files. Signed-off-by: Derrick Stolee ---

[PATCH 3/8] commit-graph: update design document

From: Derrick Stolee As it exists right now, the commit-graph feature may provide inconsistent results when combined with commit grafts, replace objects, and shallow clones. Update the design document to discuss why these interactions are difficult to reconcile and how we will avoid errors by

[PATCH 2/8] refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback

From: Stefan Beller Signed-off-by: Stefan Beller Signed-off-by: Derrick Stolee --- builtin/replace.c | 8 refs.c| 9 - refs.h| 2 +- replace-object.c | 5 +++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/replace.c

[PATCH 1/8] refs.c: migrate internal ref iteration to pass thru repository argument

From: Stefan Beller In 60ce76d3581 (refs: add repository argument to for_each_replace_ref, 2018-04-11) and 0d296c57aec (refs: allow for_each_replace_ref to handle arbitrary repositories, 2018-04-11), for_each_replace_ref learned how to iterate over refs by a given arbitrary repository. New

[PATCH 0/8] Clarify commit-graph and grafts/replace/shallow incompatibilities

One unresolved issue with the commit-graph feature is that it can cause issues when combined with replace objects, commit grafts, or shallow clones. These are not 100% incompatible, as one could be reasonably successful writing a commit-graph after replacing some objects and not have issues.

Re: [PATCH 00/16] Consolidate reachability logic

On Wed, Jul 18, 2018 at 2:30 PM Johannes Schindelin wrote: > > Hi, > > On Mon, 16 Jul 2018, Derrick Stolee wrote: > > > On 7/16/2018 2:44 PM, Eric Sunshine wrote: > > > On Mon, Jul 16, 2018 at 1:27 PM Stefan Beller wrote: > > > > Another pain point of the Gadget is that CC's in the cover letter

Re: [PATCH 6/6] submodule--helper: introduce new update-module-mode helper

On 7/12/2018 3:47 PM, Stefan Beller wrote: + fprintf(stdout, submodule_strategy_to_string(_strategy)); This line is causing build failures on 'pu' for certain setups: 2018-07-18T14:53:03.6857987Z builtin/submodule--helper.c: In function ‘module_update_module_mode’:

Re: [PATCH] sequencer.c: terminate the last line of author-scriptproperly

On 18/07/18 14:50, Phillip Wood wrote: Hi Akinori On 12/07/18 12:18, Akinori MUSHA wrote: It looks like write_author_script() intends to write out a file in Bourne shell syntax, but it doesn't put a closing single quote on the last line. This patch makes .git/rebase-merge/author-script

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

Hi Akinori On 12/07/18 12:18, Akinori MUSHA wrote: It looks like write_author_script() intends to write out a file in Bourne shell syntax, but it doesn't put a closing single quote on the last line. This patch makes .git/rebase-merge/author-script actually parsable by sh(1) by adding a single

Re: [PATCH] sequencer.c: terminate the last line of author-scriptproperly

On 18/07/18 10:45, Phillip Wood wrote: Hi Junio On 12/07/18 18:22, Junio C Hamano wrote: "Akinori MUSHA" writes: It looks like write_author_script() intends to write out a file in Bourne shell syntax, but it doesn't put a closing single quote on the last line. s/closing single quote/&

[PATCH] TO-SQUASH: replace the_repository with arbitrary r

Signed-off-by: Derrick Stolee --- This should just be squashed into PATCH 2. builtin/replace.c | 5 ++--- replace-object.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 5f34659071..d0b1cdb061 100644 --- a/builtin/replace.c

Re: [RFC] push: add documentation on push v2

On 7/17/2018 7:25 PM, Stefan Beller wrote: On Tue, Jul 17, 2018 at 2:09 PM Brandon Williams wrote: Signed-off-by: Brandon Williams --- Since introducing protocol v2 and enabling fetch I've been thinking about what its inverse 'push' would look like. After talking with a number of people I

Re: [PATCH] gc: do not warn about too many loose objects

On Tue, Jul 17 2018, Jeff King wrote: > On Tue, Jul 17, 2018 at 10:59:50AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> That doesn't make sense to me. Just because git itself is happily >> ignoring the exit code I don't think that should mean there shouldn't be >> a meaningful exit code. Why

[ANNOUNCE] Git Rev News edition 41

Hi everyone, The 41th edition of Git Rev News is now published: https://git.github.io/rev_news/2018/07/18/edition-41/ Thanks a lot to the contributors: Luca Milanesio and Derrick Stolee! Enjoy, Christian, Jakub, Markus and Gabriel.

Re: [PATCH 00/16] Consolidate reachability logic

Hi Eric & Peff, On Mon, 16 Jul 2018, Eric Sunshine wrote: > On Mon, Jul 16, 2018 at 2:56 PM Jeff King wrote: > > On Mon, Jul 16, 2018 at 02:40:21PM -0400, Eric Sunshine wrote: > > > On Mon, Jul 16, 2018 at 12:18 PM Jeff King wrote: > > > > git-send-email uses the current time minus an offset,

Re: [PATCH 00/16] Consolidate reachability logic

Hi, On Mon, 16 Jul 2018, Derrick Stolee wrote: > On 7/16/2018 2:44 PM, Eric Sunshine wrote: > > On Mon, Jul 16, 2018 at 1:27 PM Stefan Beller wrote: > > > Another pain point of the Gadget is that CC's in the cover letter > > > do not work as I would imagine. The line > > > > > > CC:

Re: [PATCH 00/16] Consolidate reachability logic

Hi Peff, On Mon, 16 Jul 2018, Jeff King wrote: > On Mon, Jul 16, 2018 at 02:54:38PM +0100, Ramsay Jones wrote: > > > On 16/07/18 14:00, Derrick Stolee via GitGitGadget wrote: > > > There are many places in Git that use a commit walk to determine > > > reachability between commits and/or refs. A

Re: Git 2.18: RUNTIME_PREFIX... is it working?

Hi, [dropping Perry's non-working email address again] On Sat, 14 Jul 2018, brian m. carlson wrote: > On Tue, Jul 10, 2018 at 10:03:10AM -0400, Jeff King wrote: > > My point is that aside from RUNTIME_PREFIX, we don't need /proc. So > > somebody who currently builds Git with a static path like

Re: [PATCH 0/4] Use oid_object_info() instead of read_object_file()

Hi Olga, On Fri, 13 Jul 2018, Оля Тележная wrote: > 2018-07-09 11:27 GMT+03:00 Оля Тележная : > > Hello everyone, > > This is my new attempt to start using oid_object_info_extended() in > > ref-filter. You could look at previous one [1] [2] but it is not > > necessary. > > > > The goal (still)

sed: command garbled: rGIT-PERL-HEADER

I'm trying to build Git 2.18 on Solaris 11.3 x86_64. $ gmake V=1 rm -f git-add--interactive git-add--interactive+ && \ sed -e '1{' \ -e 's|#!.*perl|#!/usr/bin/perl|' \ -e 'rGIT-PERL-HEADER' \ -e 'G' \ -e '}' \ -e 's/@@GIT_VERSION@@/2.18.0/g' \

Re: [PATCH 2/2] refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback

On 7/17/2018 6:49 PM, Stefan Beller wrote: Signed-off-by: Stefan Beller --- builtin/replace.c | 3 ++- refs.c| 9 - refs.h| 2 +- replace-object.c | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c

Re: [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM

Am Tue, 17 Jul 2018 14:31:36 -0700 schrieb Junio C Hamano : > Henning Schild writes: > > > diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh > > index a5d3b2cba..3fe02876c 100755 > > --- a/t/lib-gpg.sh > > +++ b/t/lib-gpg.sh > > @@ -38,7 +38,33 @@ then > >

Re: [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format

Am Tue, 17 Jul 2018 14:31:56 -0700 schrieb Junio C Hamano : > Henning Schild writes: > > > Test setting gpg.format to both invalid and valid values. > > > > Signed-off-by: Henning Schild > > --- > > t/t7510-signed-commit.sh | 9 + > > 1 file changed, 9 insertions(+) > > > > diff --git

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

Hi Junio On 12/07/18 18:22, Junio C Hamano wrote: "Akinori MUSHA" writes: It looks like write_author_script() intends to write out a file in Bourne shell syntax, but it doesn't put a closing single quote on the last line. s/closing single quote/& and the terminating newline/? This

[PATCH v5 7/7] gpg-interface t: extend the existing GPG tests with GPGSM

Add test cases to cover the new X509/gpgsm support. Most of them resemble existing ones. They just switch the format to x509 and set the signingkey when creating signatures. Validation of signatures does not need any configuration of git, it does need gpgsm to be configured to trust the

[PATCH v5 2/7] t/t7510: check the validation of the new config gpg.format

Test setting gpg.format to both invalid and valid values. Signed-off-by: Henning Schild --- t/t7510-signed-commit.sh | 7 +++ 1 file changed, 7 insertions(+) diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 6e2015ed9..4e37ff8f1 100755 --- a/t/t7510-signed-commit.sh

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

Hi Akinori On 12/07/18 12:18, Akinori MUSHA wrote: It looks like write_author_script() intends to write out a file in Bourne shell syntax, but it doesn't put a closing single quote on the last line. This patch makes .git/rebase-merge/author-script actually parsable by sh(1) by adding a single

Receiving console output from GIT 10mins after abort/termination?

Hi @ll, I hope I'm posting to the right group (not sure if it's Windows related) but I've got a weird problem using GIT: By accident I've tried to push a repository (containing an already commited but not yet pushed submodule reference). This fails immediately with an error of course BUT after

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

That's perfectly fine with me. I just thought each test case would run in a separate shell process and that's why I chose not to use a subshell for the last lines. I've learned a lot from feedback from you all. Thanks! On Wed, 18 Jul 2018 08:25:22 +0900, Junio C Hamano wrote: > > I'll squash

<    1   2