Here's v3 of ma/asciidoctor-refmiscinfo to align the headers and footers
of Asciidoctor-rendered manpages with those from AsciiDoc. Patch 1 is
new.
It turns out that with newer (>=1.5.7) versions of Asciidoctor, we get
default values of these refmiscinfo attributes put into the xml. The
hack in pa
This is still RFC, as I still haven't done performance testing yet. I'm
mainly looking for feedback right now on patch 3/3, which extends the
tr2_dst API with an optional function to write a custom message into the
overload sentinel file.
Changes since V2:
* Added a new patch (3/3) that allows the
Thanks Martin and Junio for the comments on the previous round.
Changes compared to the previous round:
- Document that when failing to refresh the index, the result won't be
written to disk.
- Rollback the lock file if refreshing the index fails, so we don't
end up with a lock file that can't
Hi Carlo,
On Thu, 8 Aug 2019, Carlo Arenas wrote:
> PS. I might had broken something here as I can't see the test results
> that failed
> https://dev.azure.com/git/git/_build/results?buildId=857&view=ms.vss-test-web.build-test-results-tab
The test results load dynamically, so you'll probably jus
On Thu, Aug 8, 2019 at 1:21 PM Johannes Schindelin
wrote:
> On Tue, 6 Aug 2019, Carlo Marcelo Arenas Belón wrote:
> > Eitherway, since I am unable to replicate the original bug or take
> > performance numbers in a representative environment without Windows
> > this is only published as an RFC, eve
Hi Carlo,
On Tue, 6 Aug 2019, Carlo Marcelo Arenas Belón wrote:
> Eitherway, since I am unable to replicate the original bug or take
> performance numbers in a representative environment without Windows
> this is only published as an RFC, eventhough it has been tested and
> considered mostly comp
Carlo Marcelo Arenas Belón writes:
> Junio, could you comment in my assumption that the use of grep in
> revision.c doesn't require initializing a PCRE2 global context and
> therefore not doing the cleanup?
Many callers of setup_revisions() do so only to run two-thing diffs
(e.g. run_diff_files
This series is a candidate reroll for cb/pcre2-chartables-leakfix, that
hopefully addresses the root cause of the problem reported by Dscho in
Windows, where the PCRE2 library wasn't aware of the custom allocator and
was returning a pointer created with the system malloc but passing it to
NED's fre
Hi Jonathan,
On Fri, 2 Aug 2019, Jonathan Nieder wrote:
> SZEDER Gábor wrote:
> > On Fri, Aug 02, 2019 at 09:59:13AM -0700, Jonathan Nieder wrote:
>
> >> In the short term, we can run tests internally to check that Git keeps
> >> following the schema. Let's not block patches 1 and 2 by this ---
On Sat, Aug 03, 2019 at 09:35:49AM +0200, SZEDER Gábor wrote:
> - Limit it to 'git/git's 'pu' branch, so others can have their own
> 'pu' branch without suffering from the consequences.
> It seems easy to do so, on Travis CI these are available in the
> TRAVIS_BRANCH and TRAVIS_REPO_S
On Fri, Aug 02, 2019 at 04:06:50PM -0700, Jonathan Nieder wrote:
> SZEDER Gábor wrote:
> > On Thu, Aug 01, 2019 at 06:52:47PM -0700, Jonathan Nieder wrote:
>
> >> Gábor, if we introduce such a parameter, do you think it would make
> >> sense for us to set up a worker that passes it?
> >
> > That w
SZEDER Gábor wrote:
> On Fri, Aug 02, 2019 at 09:59:13AM -0700, Jonathan Nieder wrote:
>> In the short term, we can run tests internally to check that Git keeps
>> following the schema. Let's not block patches 1 and 2 by this ---
>
> To my understanding patch 2 is only a proof of concept: it star
SZEDER Gábor wrote:
> On Thu, Aug 01, 2019 at 06:52:47PM -0700, Jonathan Nieder wrote:
>> Gábor, if we introduce such a parameter, do you think it would make
>> sense for us to set up a worker that passes it?
>
> That would be even worse than the current approach of the third patch,
> because the
On Fri, Aug 02, 2019 at 09:59:13AM -0700, Jonathan Nieder wrote:
> The exhaustive approach really helps. Arguing against it kind of
> feels like saying "leak checkers are great, but why run one on the
> full test suite instead of a dedicated tool that exercises the code
> paths where you expect to
On Thu, Aug 01, 2019 at 06:52:47PM -0700, Jonathan Nieder wrote:
> What do you think of making the validation disabled by default and
> using a parameter (see "Running tests with special setups" in
> t/README) to turn it on? That way, it should be okay for it to take
> 10 minutes because this woul
Hi,
Johannes Schindelin wrote:
> On Thu, 1 Aug 2019, Jonathan Nieder wrote:
>> What do you think of making the validation disabled by default and
>> using a parameter (see "Running tests with special setups" in
>> t/README) to turn it on? That way, it should be okay for it to take
>> 10 minutes
Hi Jonathan & Josh,
On Thu, 1 Aug 2019, Jonathan Nieder wrote:
> Josh Steadmon wrote:
> > On 2019.07.26 15:03, Josh Steadmon wrote:
>
> >> [ajv-cli] can validate the full 1.7M line trace output in just over a
> >> minute. Moreover, it has helpful output when validation fails. So I
> >> would be h
Josh Steadmon wrote:
> On 2019.07.26 15:03, Josh Steadmon wrote:
>> [ajv-cli] can validate the full 1.7M line trace output in just over a
>> minute. Moreover, it has helpful output when validation fails. So I
>> would be happy to re-implement this using ajv-cli.
>
> Unfortunately, ajv on Travis is
On 2019.07.26 15:03, Josh Steadmon wrote:
[snip]
> [ajv-cli] can validate the full 1.7M line trace output in just over a
> minute. Moreover, it has helpful output when validation fails. So I
> would be happy to re-implement this using ajv-cli.
Unfortunately, ajv on Travis is much slower than on my
Hi Gábor,
On Fri, 26 Jul 2019, SZEDER Gábor wrote:
> On Fri, Jul 26, 2019 at 02:12:39PM +0200, Johannes Schindelin wrote:
>
> > Besides, I have to admit that I am quite disheartened to see these lines
> > in the log:
> >
> > -- snip --
> > 2019/07/26 11:39:28 Validated items: 0
> > 2019/07/26 11:
On 2019.07.26 14:12, Johannes Schindelin wrote:
> Hi,
>
> On Fri, 26 Jul 2019, SZEDER Gábor wrote:
>
> > On Wed, Jul 24, 2019 at 04:06:50PM -0700, Josh Steadmon wrote:
> >
> > > 3: acf3aebcaa ! 3: a07458b2e4 ci: run trace2 schema validation in the
> > > CI suite
> > > @@ ci/run-build-and-t
On 2019.07.25 09:14, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> >> I would appreciate any feedback on better ways to integrate the
> >> validator into the CI suite.
> >
> > How about adding a test script dedicated to JSON schema validation,
> > which runs only as many git commands as needed
On Fri, Jul 26, 2019 at 02:12:39PM +0200, Johannes Schindelin wrote:
> I was wary about this patch series ever since I got aware that it
> refuses to use an already-available JSON schema validator (such as
> `ajv`, a seemingly well-established all-purpose validator that even
> claims to be the fast
Hi,
On Fri, 26 Jul 2019, SZEDER Gábor wrote:
> On Wed, Jul 24, 2019 at 04:06:50PM -0700, Josh Steadmon wrote:
>
> > 3: acf3aebcaa ! 3: a07458b2e4 ci: run trace2 schema validation in the CI
> > suite
> > @@ ci/run-build-and-tests.sh: then
> > make test
> > + t/trace_sc
On Wed, Jul 24, 2019 at 04:06:50PM -0700, Josh Steadmon wrote:
> Changes since V2 of this series:
> * corrected commit message regarding the different schema variations
> * cleaned up the Makefile
> * added comment noting that the validator expects JSON-Lines input
> * added a --progress flag to th
SZEDER Gábor writes:
>> I would appreciate any feedback on better ways to integrate the
>> validator into the CI suite.
>
> How about adding a test script dedicated to JSON schema validation,
> which runs only as many git commands as needed to cover all trace2
> events.
Sensible, but might be ha
On Wed, Jul 24, 2019 at 04:06:50PM -0700, Josh Steadmon wrote:
> This is a proof of concept series that formalizes the structure of trace2
> event
> output using JSON-Schema [1].
>
> It provides a validator (written in Go) that verifies the events in a given
> trace2 event output file match the s
This is a proof of concept series that formalizes the structure of trace2 event
output using JSON-Schema [1].
It provides a validator (written in Go) that verifies the events in a given
trace2 event output file match the schema. I am happy to rewrite this validator
in some other language, provided
On 7/9/2019 6:05 PM, Junio C Hamano wrote:
> Derrick Stolee writes:
>
>> From this list, do you think any of these settings are likely to
>> become defaults? It seems that protocol.version = 2 may be a default
>> now that _most_ services have an implementation, and it always falls
>> back to prot
Based on the discussion of the previous patches, we concluded that
changing the default will require a transitional period.
As such, I have introduced a deprecation warning that is printed when
the log builtin commands are used.
Thanks to Junio and everyone else for providing feedback on how to
p
Derrick Stolee writes:
> On 7/1/2019 10:29 AM, Derrick Stolee via GitGitGadget wrote:
>>
>> Here is a second run at this RFC, which aims to create a "meta" config
>> setting that automatically turns on other settings according to a user's
>> willingness to trade new Git behavior or new feature ris
It is not uncommon for people to change their name or e-mail address.
To facilitate this, Git provides support for the `.mailmap` file,
which contains a list of identities and previously used e-mail
addresses that are associated with that identity.
Unfortunately, while Git's support for the `.mail
Derrick Stolee writes:
> From this list, do you think any of these settings are likely to
> become defaults? It seems that protocol.version = 2 may be a default
> now that _most_ services have an implementation, and it always falls
> back to protocol v1 without extra cost.
>
> When pack.useSparse
On 7/9/2019 3:21 PM, Junio C Hamano wrote:
> Derrick Stolee writes:
>
>> The other category that has been discussed already is that of "experimental
>> features that we generally think are helpful but change behavior slightly in
>> some cases".
>>
>> feature.experimental:
>> pac
Derrick Stolee writes:
> The other category that has been discussed already is that of "experimental
> features that we generally think are helpful but change behavior slightly in
> some cases".
>
> feature.experimental:
> pack.useSparse = true
> status.aheadBehi
Hi Derrick,
I'm a little bit late to the part, but I think that this is a really
interesting feature with a lot of really interesting discussion so far.
I hope you don't mind me throwing in my $.02 as well :-).
On Mon, Jul 08, 2019 at 03:22:49PM -0400, Derrick Stolee wrote:
> On 7/1/2019 10:29 A
On 7/1/2019 10:29 AM, Derrick Stolee via GitGitGadget wrote:
> Here is a second run at this RFC, which aims to create a "meta" config
> setting that automatically turns on other settings according to a user's
> willingness to trade new Git behavior or new feature risk for performance
> benefits. Th
Here is a second run at this RFC, which aims to create a "meta" config
setting that automatically turns on other settings according to a user's
willingness to trade new Git behavior or new feature risk for performance
benefits. The new name for the setting is "core.featureAdoptionRate" and is
an in
Unlike hashmap that has t/helper/test-hashmap.c and t/t0011-hashmap.sh
oidmap has no specific test. The goal of this small patch series is to
change that and also improve oidmap a bit while at it.
Changes compared to V2 are the following:
- removed suprious space between ">" and "actual" in t00
Adding a `--skip` option to make skipping commits easier for the user
and to make the commands more consistent. This will serve as a small
step to the bigger goal which improving consistency of sequencer commands,
i.e., improving how command line arguments are handled, this will also
lead to better
Ævar Arnfjörð Bjarmason writes:
> This is a proposed replacement for Junio's version of the
> ... the
> root cause is that we're needlessly doing the config->cli parsing in
> the wrong order, so let's just fix that.
Yup, that's absolutely the right approach. I just wanted to avoid
restructurin
This is a proposed replacement for Junio's version of the
sendemail.transferencoding bugfix. As explained in 3/3 I think the
root cause is that we're needlessly doing the config->cli parsing in
the wrong order, so let's just fix that.
It fixes the bug at hand, and makes the coge less fragile for f
Kyle Meyer writes:
> The series improves the handling of sub-repositories that don't have a
> commit checked out. In particular, it addresses the following issues:
> ...
> * Commit message tweaks. These include replacing wording like "no
> commits" with something like "no commit checked o
This is a reroll of <20190402183505.31512-1-k...@kyleam.com>. Thanks,
Junio, for your comments on v2.
The series improves the handling of sub-repositories that don't have a
commit checked out. In particular, it addresses the following issues:
* Calling 'git add repo' is meant to register the
Hi,
This is my SoC 2019 Microproject: "Avoid pipes in git related commands
in test scripts".
Changes since v2:
- drop changes to other 2 files as suggested by Christian Couder[1]
- rename commit message from "t-basic:" to "t:"[1]
- use better commit message suggest
On Mon, Mar 4, 2019 at 7:08 AM Rohit Ashiwal wrote:
> This patch ultimately aims to replace `test -(d|f|e|s)` calls in t3600-rm.sh
> Previously we were using these to verify the presence of diretory/file, but
> we already have helper functions, viz, `test_path_is_dir`,
> `test_path_is_file`,
> `t
This patch ultimately aims to replace `test -(d|f|e|s)` calls in t3600-rm.sh
Previously we were using these to verify the presence of diretory/file, but
we already have helper functions, viz, `test_path_is_dir`, `test_path_is_file`,
`test_path_is_missing` and `test_file_not_empty` with better funct
Denton Liu writes:
> By the way, just for the record, how would you like me to handle
> patchsets that cause merge conflicts?
When it happens, I may ask you to rebase onto a specific commit.
https://public-inbox.org/git/xmqq5ztxstkh@gitster-ct.c.googlers.com/
is a recent example.
My prefere
On Thu, Feb 07, 2019 at 10:01:40AM -0800, Junio C Hamano wrote:
> Denton Liu writes:
>
> > I rebased the changes onto the latest 'next' because if this branch gets
> > merged into 'next', there'll be merge conflicts from
> > 'dl/complete-submodule-absorbgitdirs'.
>
> Please don't do that.
>
> A
Denton Liu writes:
> I rebased the changes onto the latest 'next' because if this branch gets
> merged into 'next', there'll be merge conflicts from
> 'dl/complete-submodule-absorbgitdirs'.
Please don't do that.
A topic that depends on everything in 'next' cannot graduate to
'master' until ever
I rebased the changes onto the latest 'next' because if this branch gets
merged into 'next', there'll be merge conflicts from
'dl/complete-submodule-absorbgitdirs'.
Currently, there is no way to set the branch of a submodule without
manually manipulating the .gitmodules file. This patchset introdu
Sun Chao (my former colleague at Huawei) found a bug of
git-pack-redundant. If there are too many packs and many of them overlap
each other, running `git pack-redundant --all` will exhaust all memories
and the process will be killed by kernel.
There is a script in commit log of commit 2/3, which
On Sun, Dec 16, 2018 at 01:57:56PM -0800, nbelakov...@gmail.com wrote:
> Finally got around to submitting latest changes.
>
> I think this addresses all the feedback
>
> The atom now returns the worktree path instead of '+'
Thanks, I think patch 1 is definitely going in the right direction.
The
From: Nickolai Belakovski
Finally got around to submitting latest changes.
I think this addresses all the feedback
The atom now returns the worktree path instead of '+'
I stuck to cyan for the coloring, since it seemed most popular
I added one more change to display the worktree path in cyan
Ad a new fuzz test for the commit graph and fix a buffer read-overflow
that it discovered. Additionally, fix the Makefile instructions for
building fuzzers.
Changes since V2:
* Avoid pointer arithmetic overflow when checking the graph's chunk
count.
* Merge the corrupt_graph_and_verify and
Thanks.
I think this one is identical to what has already been queued and
nerged to 'next'.
k
This is a resend of patchset v3 where we add another patch on top of the
existing patchset in order to document the guitool keys for `git
config`. This way, the completions script will now be able to complete
these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
the macro generated code from delta-islands (using khash) triggers
some unused function warnings in macOS, OpenBSD and some linux with a
newer version of clang because of its use of static functions.
Changes from v2:
* Relay in the C code including git-compat-util as suggested by Jeff
* Commit mes
This adds another patch on top of the existing patchset in order to document the
guitool keys for `git config`. This way, the completions script will now be able
to complete these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
completion: support `git mergetoo
Hi,
On Mon, 22 Oct 2018, Johannes Schindelin via GitGitGadget wrote:
> Under certain circumstances, commits that were reachable can be made
> unreachable, e.g. via git fetch --prune. These commits might have been
> packed already, in which case git repack -adlf will just drop them without
> givin
Under certain circumstances, commits that were reachable can be made
unreachable, e.g. via git fetch --prune. These commits might have been
packed already, in which case git repack -adlf will just drop them without
giving them the usual grace period before an eventual git prune (via git gc)
prunes
From: Ben Peart
Reworded the documentation for git-reset per review feedback.
Base Ref:
Web-Diff: https://github.com/benpeart/git/commit/1228898917
Checkout: git fetch https://github.com/benpeart/git reset-refresh-index-v3 &&
git checkout 1228898917
### Interdiff (v2..v3):
diff --git a/Docu
On Wed, Oct 03, 2018 at 01:42:39PM +0200, Rasmus Villemoes wrote:
> v2: Added patches 2 and 3, made "git cmd --help" unconditionally (no
> config option, no delay) redirect to the aliased command's help,
> preserve pre-existing behaviour of the spelling "git help cmd".
>
> v3: Add some additional
v2: Added patches 2 and 3, made "git cmd --help" unconditionally (no
config option, no delay) redirect to the aliased command's help,
preserve pre-existing behaviour of the spelling "git help cmd".
v3: Add some additional comments in patch 1 and avoid triggering leak
checker reports. Use better wo
Take 3. Addressed the issue that Junio turned up the last time I sent
this out for review.
I'm not entirely sure I like the way I added the tests in the first
patch, but it's unclear to me if there's actually a pattern for setting
up and tearing down the same env for multiple test methods. There a
To recap: 't5561-http-backend.sh' is prone to occasional failures;
luckily it's not 'git-http-backend's fault, but the test script is a
bit racy; patch 3/3's commit message discusses the details at length.
Changes since v2:
- Use 'test_when_finished' to clear the access log in the first
pat
Thes patch series rewrites the reflog operations from shell to C. This
is part of the effort to rewrite interactive rebase in C.
The first commit is dedicated to creating a function to silence a
command, as the sequencer will do in several places with these patches.
This branch is based on ag/re
v3 fixes an annoying bug in 3/3. If you do "git commit --fi"
then the "fi" part is eaten up by bash and you got back to
"git commit --" on the command line.
This is because we give COMPREPLY with two options "--fixup" and
"--no-...". The second one forces the common prefix "--" for both
of them, i
This is a reroll of my attempt at freeing the memory allocated by
`setup_unpack_trees_porcelain()`. The first two patches are identical to
v2. The third patch no longer relies on rather intimate knowledge of
which strings are on the heap and which pointers are duplicates.
Instead, as suggested by J
Changes from v2: followed all Stefan's comments.
Jonathan Tan (3):
upload-pack: fix error message typo
upload-pack: read config when serving protocol v2
{fetch,upload}-pack: support filter in protocol v2
Documentation/technical/protocol-v2.txt | 9 ++
fetch-pack.c
Hi Ben,
On Thu, Apr 26, 2018 at 1:52 PM, Ben Peart wrote:
> This is a complete rewrite based on the feedback from earlier patches.
Thanks for pushing forward on this.
> Update the documentation to better indicate command line options that override
> various config settings related to merge.
>
>
This is a complete rewrite based on the feedback from earlier patches.
Update the documentation to better indicate command line options that override
various config settings related to merge.
Add a new config merge.renames setting to to control the rename detection
behavior of merge. This settin
On Mon, Apr 02 2018, Phillip Wood wrote:
> On 31/03/18 20:20, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Fri, Mar 30 2018, Phillip Wood wrote:
>>
>>> On 29/03/18 19:32, Junio C Hamano wrote:
Phillip Wood writes:
> From: Phillip Wood
>
> Since v2 I've updated the patches to us
On 31/03/18 20:20, Ævar Arnfjörð Bjarmason wrote:
>
> On Fri, Mar 30 2018, Phillip Wood wrote:
>
>> On 29/03/18 19:32, Junio C Hamano wrote:
>>> Phillip Wood writes:
>>>
From: Phillip Wood
Since v2 I've updated the patches to use '-' instead of '^' to invert
the selection to
On Fri, Mar 30 2018, Phillip Wood wrote:
> On 29/03/18 19:32, Junio C Hamano wrote:
>> Phillip Wood writes:
>>
>>> From: Phillip Wood
>>>
>>> Since v2 I've updated the patches to use '-' instead of '^' to invert
>>> the selection to match the rest of add -i and clean -i.
>>>
>>> These patches b
On 29/03/18 19:32, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> From: Phillip Wood
>>
>> Since v2 I've updated the patches to use '-' instead of '^' to invert
>> the selection to match the rest of add -i and clean -i.
>>
>> These patches build on top of the recount fixes in [1]. The commit
Phillip Wood writes:
> From: Phillip Wood
>
> Since v2 I've updated the patches to use '-' instead of '^' to invert
> the selection to match the rest of add -i and clean -i.
>
> These patches build on top of the recount fixes in [1]. The commit
> message for the first patch describes the motivat
v3 fixes the fallthru warnings in connect.c, and with json-writer
series rerolled, 'pu' should build cleanly now.
-Wno-maybe-uninitialized is removed, thanks to Ramsay.
v3 also adds an experimental patch that adds EAGER_DEVELOPER=1. These
developers will have all warnings enabled (nothing is suppr
Changes from v2:
- Code Review Reactions
- Lifetime management functions for mem_pool will be included in
future patch series
This patch series extracts the memory pool implementation, currently
used by fast-import, into a generalized component. This memory pool
can then be generally u
From: Phillip Wood
Since v2 I've updated the patches to use '-' instead of '^' to invert
the selection to match the rest of add -i and clean -i.
These patches build on top of the recount fixes in [1]. The commit
message for the first patch describes the motivation:
"When I end up editing hunks
On Thu, Feb 22, 2018 at 7:54 AM, Tim Landscheidt
wrote:
> Junio C Hamano wrote:
>
>>> Compared to v2:
>
>>> - the potential loss of errno before it's printed out in builtin/am.c
>>> is fixed.
>>> - keep update_ref() in sequencer.c non-fatal like this rest
>>> - rename ORIG_COMMIT to REBASE_HEA
Junio C Hamano wrote:
>> Compared to v2:
>> - the potential loss of errno before it's printed out in builtin/am.c
>> is fixed.
>> - keep update_ref() in sequencer.c non-fatal like this rest
>> - rename ORIG_COMMIT to REBASE_HEAD
>> Interdiff:
> This round hasn't seen any comments. Is everyb
Nguyễn Thái Ngọc Duy writes:
> Compared to v2:
>
> - the potential loss of errno before it's printed out in builtin/am.c
> is fixed.
> - keep update_ref() in sequencer.c non-fatal like this rest
> - rename ORIG_COMMIT to REBASE_HEAD
>
> Interdiff:
This round hasn't seen any comments. Is ever
Compared to v2:
- the potential loss of errno before it's printed out in builtin/am.c
is fixed.
- keep update_ref() in sequencer.c non-fatal like this rest
- rename ORIG_COMMIT to REBASE_HEAD
Interdiff:
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6da9296bf8..
From: Phillip Wood
The new test and the test hook scripts has been updated with some style
fixes spotted by Junio. I've added an extra commit at the beginning to
update the style of the original hook, so my later changes are
clearer.
Original cover letter:
These two patches add some tests and f
On 01/19, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Friendly ping on this series now that 2.16 is out :) Is there anything
> > in this series (up to 3/3, 4/3 can be dropped now that Duy fixed it in
> > a nicer way) that still needs updating? It fixes a few bugs in split
> > index mod
Thomas Gummerer writes:
> Friendly ping on this series now that 2.16 is out :) Is there anything
> in this series (up to 3/3, 4/3 can be dropped now that Duy fixed it in
> a nicer way) that still needs updating? It fixes a few bugs in split
> index mode with submodules/worktrees, so it would be
Friendly ping on this series now that 2.16 is out :) Is there anything
in this series (up to 3/3, 4/3 can be dropped now that Duy fixed it in
a nicer way) that still needs updating? It fixes a few bugs in split
index mode with submodules/worktrees, so it would be nice to get this
reviewed/merged.
Thanks Brandon and Lars for comments on the previous round.
Previous rounds were at <20171210212202.28231-1-t.gumme...@gmail.com>
and <20171217225122.28941-1-t.gumme...@gmail.com>.
Changes since the previous round:
- reworked the patches to no longer try to use struct repository for
worktrees,
Sorry about the noise with v2 and v3 so quickly one after another. I
only too late realized that the new dwim for 'add '
doesn't make much sense if -b or --detach are given, and it's better
to keep on erroring out in these cases.
The previous rounds were at
https://public-inbox.org/git/20171112
Johannes Schindelin writes:
> Changes since v2:
>
> - fixed the commit message of 1/3 to no longer talk about :remote.
OK. It now matches what we have had since October 5th in my tree.
> - used the push atom in 2/3, made the code look more as suggested by Junio.
I am pleasantly surprised (mos
This introduces support for
git for-each-ref \
--format="%(merge:remotename),%(merge:remoteref)"
git for-each-ref \
--format="%(push:remotename),%(push:remoteref)"
to figure out the remote nickname as well as the name of the corresponding
branch on
On Mon, 23 Oct 2017, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Interdiff below:
>
> Thanks. Looks much more polished.
>
> >
> > diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> > index 89b6a0e672..8be661007d 100644
> > --- a/Documentation/git-stash.txt
> > +++
Jeff King writes:
> On Mon, Oct 23, 2017 at 10:19:38AM +0900, Junio C Hamano wrote:
>
>> > - This option is deprecated in favour of 'git stash push'.
>> > + This option is deprecated in favour of 'git stash push'. It
>> > + differs from "stash push" in that it cannot take pathspecs,
>> > + a
On Mon, Oct 23, 2017 at 10:19:38AM +0900, Junio C Hamano wrote:
> > - This option is deprecated in favour of 'git stash push'.
> > + This option is deprecated in favour of 'git stash push'. It
> > + differs from "stash push" in that it cannot take pathspecs,
> > + and any non-option argum
Overall the result looks reasonable and get us closer to the ideal
world where nobody recalls "stash save" has ever existed ;-)
Will queue; thanks.
Thomas Gummerer writes:
> Interdiff below:
Thanks. Looks much more polished.
>
> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> index 89b6a0e672..8be661007d 100644
> --- a/Documentation/git-stash.txt
> +++ b/Documentation/git-stash.txt
> @@ -86,7 +86,9 @@ The `--patch
On Sun, Oct 22, 2017 at 06:04:06PM +0100, Thomas Gummerer wrote:
> Thanks Peff for the review of the previous rounds.
>
> In addition to addressing the review comments, this round adds another
> patch getting rid of the extra help with an unknown option to git
> stash push.
Yeah, the reasoning i
Thanks Peff for the review of the previous rounds.
In addition to addressing the review comments, this round adds another
patch getting rid of the extra help with an unknown option to git
stash push.
Interdiff below:
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 89
Code was using two string_lists, one for the directories and
one for the files. The code never checks the lists independently
so we should be able to only use one list. The string_list also
is a O(log n) for lookup and insertion. Switching this to use a
hashmap will give O(1) which will save som
1 - 100 of 173 matches
Mail list logo
