"Junio C Hamano" wrote:
> I think the plan was to make code drop from time to time at major
> release points of git-multimail, but I do not think we've seen many
> updates recently.
I realize I didn't answer this point. The reason you didn't see any
update recently is just that there haven't bee
On Mon, Nov 06, 2017 at 04:19:48PM -0500, Antoine Beaupré wrote:
> From: Ingo Ruhnke
>
> we still want to use spaces as separators in the config, but we should
> allow the user to specify namespaces with spaces, so we use underscore
> for this.
>
> Reviewed-by: Antoine Beaupré
> Signed-off-by:
A new option --ignore-cr-at-eol tells the diff machinery to treat a
carriage-return at the end of a (complete) line as if it does not
exist.
This would make it easier to review a change whose only effect is to
turn line endings from CRLF to LF or the other way around.
Signed-off-by: Junio C Haman
We have packed the bits too tightly in such a way that it is not
easy to add a new type of whitespace ignoring option, a new type
of LCS algorithm, or a new type of post-cleanup heuristics.
Reorder bits a bit to give room for these three classes of options
to grow. Also make use of XDF_WHITESPACE
This time with doc updates and tests. The previous one is at
https://public-inbox.org/git/xmqqshe7j0af@gitster.mtv.corp.google.com
A change that is supposed to only change the end-of-line convention
between LF <-> CRLF and nothing else can be verified with "diff -b"
or "diff --ignore-space-
On Tue, Nov 7, 2017 at 2:15 AM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> +sub packet_required_key_val_read {
>> + my ( $key ) = @_;
>> + my ( $res, $buf ) = packet_txt_read();
>> + unless ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) {
>> + die "bad
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> Make it safer to normalize the line endings in a repository:
> Files that had been commited with CRLF will be commited with LF.
> ...
> Helped-By: Junio C Hamano
> Signed-off-by: Torsten Bögershausen
> ---
Nicely explained.
> @@ -175,6 +1
The mailing address for the FSF has changed over the years. Rather than
updating the address across all files, refer readers to gnu.org, as the
GNU GPL documentation now suggests for license notices. The mailing
address is retained in the full license files (COPYING and LGPL-2.1).
The old addres
Phillip Wood writes:
> diff --git a/sequencer.c b/sequencer.c
> index
> ae24405c23d021ed7916e5e2d9df6de27f867a2e..3e4c3bbb265db58df22cfcb5a321fb74d822327e
> 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -477,9 +477,6 @@ static int do_recursive_merge(struct commit *base, struct
> commit *
Phillip Wood writes:
> From: Phillip Wood
>
> Return an error rather than dying so that the sequencer can exit
> cleanly once it starts committing without forking 'git commit'
>
> Signed-off-by: Phillip Wood
> ---
>...
> @@ -948,7 +951,9 @@ void print_commit_summary(const char *prefix, const
>
Phillip Wood writes:
> From: Phillip Wood
>
> Move print_commit_summary() from builtin/commit.c to sequencer.c so it
> can be shared with other commands. The function is modified by
> changing the last argument to a flag so callers can specify whether
> they want to show the author date in addit
Phillip Wood writes:
> From: Phillip Wood
>
> Move run_rewrite_hook() from bulitin/commit.c to sequencer.c so it can
> be shared with other commands and add a new function
> commit_post_rewrite() based on the code in builtin/commit.c that
> encapsulates rewriting notes and running the post-rewri
Phillip Wood writes:
> @@ -1735,25 +1733,10 @@ int cmd_commit(int argc, const char **argv, const
> char *prefix)
> strbuf_release(&author_ident);
> free_commit_extra_headers(extra);
>
> - nl = strchr(sb.buf, '\n');
> - if (nl)
> - strbuf_setlen(&sb, nl + 1 - sb.
Thanks for all the feedback provided!
I'd like to summarise what consensus we have reached so far and
then propose a way forward:
* we'll use the term "ellipsis (pl. ellipses)" for what's
been referred to as "3dots", "n-dots", "many dots" and so
forth
* we would like to use ellip
On 2017-11-07 09:44:03, Junio C Hamano wrote:
> Antoine Beaupré writes:
>
>> On 2017-10-31 10:37:29, Junio C Hamano wrote:
There's also a hybrid solution used by git-multimail: have a copy of the
code in git.git, but do the development separately. I'm not sure it'd be
a good idea fo
Stefan Beller writes:
>> * sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
>> (merged to 'next' on 2017-10-26 at 30994b4c76)
>> + Documentation/checkout: clarify submodule HEADs to be detached
>> + recursive submodules: detach HEAD from new state
>>
>> "git checkout --recu
Jonathan Tan writes:
> Factor out the commonalities from test_submodule_switch() and
> test_submodule_forced_switch() in lib-submodule-update.sh, and document
> their usage.
>
> This also makes explicit (through the KNOWN_FAILURE_FORCED_SWITCH_TESTS
> variable) the fact that, currently, all funct
Hi Phillip,
On Mon, 6 Nov 2017, Phillip Wood wrote:
> From: Phillip Wood
>
> If the commit message does not need to be edited then create the
> commit without forking 'git commit'. Taking the best time of ten runs
> with a warm cache this reduces the time taken to cherry-pick 10
> commits by 27
Christian Couder writes:
> t/t0021/rot13-filter.pl | 58
> ++---
> 1 file changed, 45 insertions(+), 13 deletions(-)
Makes sense.
Christian Couder writes:
> As checking for a lf character at the end of a buffer
> will be useful in another function, let's refactor this
> functionality into a small remove_final_lf_or_die()
> helper function.
>
> Signed-off-by: Christian Couder
> ---
> t/t0021/rot13-filter.pl | 14 ++
Christian Couder writes:
> +sub packet_required_key_val_read {
> + my ( $key ) = @_;
> + my ( $res, $buf ) = packet_txt_read();
> + unless ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) {
> + die "bad $key: '$buf'";
> + }
> + return ( $res, $buf );
> +}
T
Hi Phillip,
On Mon, 6 Nov 2017, Phillip Wood wrote:
> From: Phillip Wood
>
> Load default values for message cleanup and gpg signing of commits in
> preparation for committing without forking 'git commit'.
Nicely explained.
> diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
>
Christian Couder writes:
> +sub packet_compare_lists {
> + my ($expect, @result) = @_;
> + my $ix;
> + if (scalar @$expect != scalar @result) {
> + return undef;
> + }
> + for ($ix = 0; $ix < $#result; $ix++) {
> + if ($expect->[$ix] ne $result[$ix]) {
Ann T Ropea writes:
> Lest we confuse the meticulous observer, we ought to retire the 3dots in
> the circumstances described above.
Yes, as I said in my response to 3/3, I think it is a good goal to
avoid n-dots used as a "here we truncated something longer" sign,
which was a very old convention
Hi Phillip,
On Mon, 6 Nov 2017, Phillip Wood wrote:
> From: Phillip Wood
>
> Add the Signed-off-by: trailer in one place rather than adding it to
> the message when doing a recursive merge and specifying '--signoff'
> when running 'git commit'.
I would find this slightly easier to understand i
Antoine Beaupré writes:
> On 2017-10-31 10:37:29, Junio C Hamano wrote:
>>> There's also a hybrid solution used by git-multimail: have a copy of the
>>> code in git.git, but do the development separately. I'm not sure it'd be
>>> a good idea for Git-Mediawiki, but I'm mentionning it for completen
Hi Phillip,
On Mon, 6 Nov 2017, Phillip Wood wrote:
> From: Phillip Wood
>
> Move the functions that check for empty messages from bulitin/commit.c
> to sequencer.c so they can be shared with other commands. The
> functions are refactored to take an explicit cleanup mode and template
> filename
Dear Friend,
I am interested in establishing and operating a very viable business as a means
of investment abroad. I do not know too well on how this is done in your
country, So I will need you to help me in this regard.
My preference is any good profit yielding business and I would appreciate
From: "Junio C Hamano"
Ann T Ropea writes:
This could be confusing not only for novices; in either case, no range
should be insinuated by describe_detached_head.
We actually do not insinuate any range in these output. These dots
denote "truncated at the end, instead of giving full length."
Jacob Keller writes:
> On November 3, 2017 8:49:15 PM PDT, Junio C Hamano wrote:
>>Rafael Ascensão writes:
>>
>>Why should this be a special case that burdens users to remember one
>>more rule? Wouldn't users find "--decorate-refs=refs/tags" useful
>>and it woulld be shorter and nicer than hav
Factor out the commonalities from test_submodule_switch() and
test_submodule_forced_switch() in lib-submodule-update.sh, and document
their usage.
This also makes explicit (through the KNOWN_FAILURE_FORCED_SWITCH_TESTS
variable) the fact that, currently, all functionality tested using
test_submodu
From: "Junio C Hamano"
Sent: Sunday, November 05, 2017 6:28 AM
"Philip Oakley" writes:
Is this not also an alternative case, relative to the user, for the
scenario where the user has an oid/sha1 value but does not know what
it is, and would like to find its source and type relative to the
`de
On 11/06, Stefan Beller wrote:
> On Mon, Nov 6, 2017 at 2:08 PM, Brandon Williams wrote:
> > Since ff6f1f564 (submodule-config: lazy-load a repository's .gitmodules
> > file, 2017-08-03) rebase interactive fails if there are any submodules
> > with unstaged changes which have been configured with
On Mon, Nov 6, 2017 at 2:08 PM, Brandon Williams wrote:
> Since ff6f1f564 (submodule-config: lazy-load a repository's .gitmodules
> file, 2017-08-03) rebase interactive fails if there are any submodules
> with unstaged changes which have been configured with a value for
> 'submodule..ignore' in th
Since ff6f1f564 (submodule-config: lazy-load a repository's .gitmodules
file, 2017-08-03) rebase interactive fails if there are any submodules
with unstaged changes which have been configured with a value for
'submodule..ignore' in the repository's config.
This is due to how configured values of '
Hopefully, the final series. This includes only one more fix, from
Thomas, to remove an extra loop.
This should, alas, be ready to merge.
From: Ingo Ruhnke
we still want to use spaces as separators in the config, but we should
allow the user to specify namespaces with spaces, so we use underscore
for this.
Reviewed-by: Antoine Beaupré
Signed-off-by: Antoine Beaupré
---
contrib/mw-to-git/git-remote-mediawiki.perl | 1 +
1 file c
Without this, the fetch process seems hanged while we fetch page
listings across the namespaces. Obviously, it should be possible to
silence this with -q, but that's an issue already present everywhere
in the code and should be fixed separately:
https://github.com/Git-Mediawiki/Git-Mediawiki/issue
If we fail to find a requested namespace, we should tell the user
which ones we know about, since those were already fetched. This
allows users to fetch all namespaces by specifying a dummy namespace,
failing, then copying the list of namespaces in the config.
Eventually, we should have a flag tha
Virtual namespaces do not correspond to pages in the database and are
automatically generated by MediaWiki. It makes little sense,
therefore, to fetch pages from those namespaces and the MW API doesn't
support listing those pages.
According to the documentation, those virtual namespaces are curren
Ideally, we'd process them in numeric order since that is more
logical, but we can't do that yet since this is where we find the
numeric identifiers in the first place. Lexicographic order is a good
compromise.
Signed-off-by: Antoine Beaupré
---
contrib/mw-to-git/git-remote-mediawiki.perl | 2 +-
When we specify a list of namespaces to fetch from, by default the MW
API will not fetch from the default namespace, refered to as "(Main)"
in the documentation:
https://www.mediawiki.org/wiki/Manual:Namespace#Built-in_namespaces
I haven't found a way to address that "(Main)" namespace when getti
From: Kevin
This introduces a new remote.origin.namespaces argument that is a
space-separated list of namespaces. The list of pages extract is then
taken from all the specified namespaces.
Reviewed-by: Antoine Beaupré
Signed-off-by: Antoine Beaupré
---
contrib/mw-to-git/git-remote-mediawiki.p
On Fri, Nov 3, 2017 at 5:46 PM, Billy O'Neal (VC LIBS)
wrote:
> Hello, Git folks. I managed to accidentally break the our test lab by
> attempting to git mv a directory with a submodule inside. It seems like if a
> reset does an undo on a mv, the workfold entry should be fixed to put the
> subm
On Mon, Nov 6, 2017 at 8:37 PM, Brandon Williams wrote:
> After reading your bug report and the fact that you weren't able to
> reproduce it outside of your project I think i figured out what is
> happening. Before ff6f1f564c the gitmodules file wasn't being loaded
> unless a codepath explicitly
Your email was successfully selected in the on-going Qatar Foundation donation,
Contact to redeem, Thanks.
---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
On November 3, 2017 8:49:15 PM PDT, Junio C Hamano wrote:
>Rafael Ascensão writes:
>
>Why should this be a special case that burdens users to remember one
>more rule? Wouldn't users find "--decorate-refs=refs/tags" useful
>and it woulld be shorter and nicer than having to say "refs/tags/*"?
>
On Mon, 6 Nov 2017 12:32:45 -0500
Jeff Hostetler wrote:
> >> Yes, that is a point I wanted to ask about. I renamed the
> >> extensions.partialclone that you created and then I moved your
> >> remote..blob-max-bytes setting to be in extensions too.
> >> Moving it to core.partialclonefilter is fin
On 11/05, Orgad Shaneh wrote:
> On Sat, Nov 4, 2017 at 8:04 PM, Orgad Shaneh wrote:
> > On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin
> > wrote:
> >> Hi Orgad,
> >>
> >> On Fri, 3 Nov 2017, Johannes Schindelin wrote:
> >>
> >>> On Thu, 2 Nov 2017, Orgad Shaneh wrote:
> >>>
> >>> > I can't r
On Mon, 6 Nov 2017 12:51:52 -0500
Jeff Hostetler wrote:
> Jonathan and I were talking off-list about the performance
> effects of inspecting the pathnames to identify the ".git*"
> special files. I added it in my first draft back in the spring,
> thinking that even if you set the blob-limit to a
On 11/2/2017 1:50 PM, Jeff Hostetler wrote:
From: Jeff Hostetler
Create traverse_commit_list_filtered() and add filtering
interface to allow certain objects to be omitted from the
traversal.
...
diff --git a/list-objects-filter.c b/list-objects-filter.c
new file mode 100644
index 000..7f2
On Sun, Nov 5, 2017 at 9:36 PM, Robert P. J. Day wrote:
>
> another picky question ... are there any other benefits of
> supporting slashes in branch names other than the obvious ones i know
> about?
>
> 1) visually, let's you *imagine* a branch hierarchy, and
> 2) allows wildcarding on a full "
On 11/3/2017 2:39 PM, Jonathan Tan wrote:
On Fri, 3 Nov 2017 09:57:18 -0400
Jeff Hostetler wrote:
On 11/2/2017 6:24 PM, Jonathan Tan wrote:
On Thu, 2 Nov 2017 20:20:44 +
Jeff Hostetler wrote:
From: Jeff Hostetler
Introduce the ability to have missing objects in a repo. This
funct
On Sat, Nov 04, 2017 at 10:07:00PM -0400, Jeff King wrote:
> Yes, I think what you've written here (and below) is quite close to the
> error_context patches I linked elsewhere in the thread. In other
> words, I think it's a sane approach.
In contrast to error_context I'd like to keep all exiting
b
On Mon, Nov 06 2017, Jeff King jotted:
> On Mon, Nov 06, 2017 at 12:50:45PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>> Some replies to the thread in general, didn't want to spread this out
>> into different replies.
>>
>> * Yes this sucks.
>>
>> * Just emitting a warning without an appropriate
On Mon, Nov 06, 2017 at 12:50:45PM +0100, Ævar Arnfjörð Bjarmason wrote:
> Some replies to the thread in general, didn't want to spread this out
> into different replies.
>
> * Yes this sucks.
>
> * Just emitting a warning without an appropriate exit code would suck
>more, would break batc
On Mon, Nov 06 2017, Jeff King jotted:
> On Sun, Nov 05, 2017 at 10:41:17AM +0100, Дилян Палаузов wrote:
>
>> I understand that the PCRE's stack can get exhausted for some files, but in
>> such cases, git grep shall proceed with the other files, and print at the
>> end/stderr for which files the
From: Phillip Wood
Move the functions that check for empty messages from bulitin/commit.c
to sequencer.c so they can be shared with other commands. The
functions are refactored to take an explicit cleanup mode and template
filename passed by the caller.
Signed-off-by: Phillip Wood
---
builtin/
From: Phillip Wood
Add update_head() based on the code that updates HEAD after committing
in builtin/commit.c that can be called by 'git commit' and other
commands.
Signed-off-by: Phillip Wood
---
builtin/commit.c | 19 +--
sequencer.c | 38
From: Phillip Wood
Move print_commit_summary() from builtin/commit.c to sequencer.c so it
can be shared with other commands. The function is modified by
changing the last argument to a flag so callers can specify whether
they want to show the author date in addition to specifying if this is
an in
From: Phillip Wood
If the commit message does not need to be edited then create the
commit without forking 'git commit'. Taking the best time of ten runs
with a warm cache this reduces the time taken to cherry-pick 10
commits by 27% (from 282ms to 204ms), and the time taken by 'git
rebase --conti
From: Phillip Wood
Return an error rather than dying so that the sequencer can exit
cleanly once it starts committing without forking 'git commit'
Signed-off-by: Phillip Wood
---
builtin/commit.c | 3 ++-
sequencer.c | 17 +++--
sequencer.h | 4 ++--
3 files changed, 15
From: Phillip Wood
Add the Signed-off-by: trailer in one place rather than adding it to
the message when doing a recursive merge and specifying '--signoff'
when running 'git commit'. This means that if there are conflicts when
merging with a strategy other than 'recursive' the Signed-off-by:
trai
From: Phillip Wood
Load default values for message cleanup and gpg signing of commits in
preparation for committing without forking 'git commit'.
Signed-off-by: Phillip Wood
---
builtin/rebase--helper.c | 13 -
builtin/revert.c | 15 +--
sequencer.c
From: Phillip Wood
Move run_rewrite_hook() from bulitin/commit.c to sequencer.c so it can
be shared with other commands and add a new function
commit_post_rewrite() based on the code in builtin/commit.c that
encapsulates rewriting notes and running the post-rewrite hook.
Signed-off-by: Phillip W
From: Phillip Wood
Changes since the last version
- reworked the second patch based on Junio's feedback so it no longer sets
GIT_REFLOG_ACTION
- reworded commit messages
- print_commit_summary() no longer dies but returns an error so the sequencer
can exit cleanly
- reworked the last pa
On Sun, Nov 05, 2017 at 09:26:30PM +0100, Martin Ågren wrote:
> In several functions, we iterate through a commit list by assigning
> `result = result->next`. As a consequence, we lose the original pointer
> and eventually leak the list.
>
> These are immediate helpers to `cmd_merge_base()` which
On Sun, Nov 05, 2017 at 12:58:18PM +0100, Martin Ågren wrote:
> On 4 November 2017 at 10:28, Jeff King wrote:
> > - the pager. config is mis-designed, because our config keys
> >cannot represent all possible command names (e.g., case folding and
> >illegal characters). This should be pag
On Sun, Nov 05, 2017 at 10:41:17AM +0100, Дилян Палаузов wrote:
> I understand that the PCRE's stack can get exhausted for some files, but in
> such cases, git grep shall proceed with the other files, and print at the
> end/stderr for which files the pattern was not applied. Such behaviour
> woul
On Fri, Nov 3, 2017 at 10:44 PM, Dennis Kaarsemaker
wrote:
> Credentials exposed by the secret service DBUS interface may be locked.
> Setting the SECRET_SEARCH_UNLOCK flag will make the secret service
> unlock these secrets, possibly prompting the user for credentials to do
> so. Without this fla
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Early batches for the next cycle h
72 matches
Mail list logo