--
Ich beabsichtige, Ihnen einen Teil meines Vermögens als freiwillige
finanzielle Spende an Sie zu geben. Reagieren Sie, um teilzunehmen.
Wang Jianlin
Wanda Gruppe
On Sat, Oct 28, 2017 at 08:28:54PM -0700, Stefan Beller wrote:
> On Sat, Oct 28, 2017 at 10:32 AM, Johannes Schindelin
> wrote:
> >
> > [..]
> > I wonder whether it would make sense to extend this to tree objects while
> > we are at it, but maybe that's an easy up-for-grabs.
>
> I can look into
Hi Stefan,
On Sat, 28 Oct 2017, Stefan Beller wrote:
> On Sat, Oct 28, 2017 at 10:32 AM, Johannes Schindelin
> wrote:
>
> > I wonder whether it would make sense to extend this to tree objects
> > while we are at it, but maybe that's an easy up-for-grabs.
>
> I can look into incorporating that,
Hi,
On Thu, 26 Oct 2017, Ben Peart wrote:
> On 10/26/2017 5:27 PM, Alex Vandiver wrote:
> > On Thu, 26 Oct 2017, Ben Peart wrote:
> > > On 10/25/2017 9:31 PM, Alex Vandiver wrote:
> > > > diff --git a/fsmonitor.c b/fsmonitor.c
> > > > index 7c1540c05..0d26ff34f 100644
> > > > --- a/fsmonitor.c
>
Hi Alex,
On Wed, 25 Oct 2017, Alex Vandiver wrote:
> Updated based on comments from Dscho and Ben. Thanks for those!
Thank you for this excellent improvement.
Ciao,
Dscho
Hi Alex,
On Fri, 27 Oct 2017, Alex Vandiver wrote:
> Updates since v2:
>
> - Fix tab which crept into 1/4
>
> - Fixed the benchmarking code in the commit message in 2/4 to just
>always load JSON::XS -- the previous version was the version where
>I'd broken that to force loading of JSO
Hi Junio,
On Fri, 27 Oct 2017, Junio C Hamano wrote:
> * cc/git-packet-pm (2017-10-22) 6 commits
> - Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
> - t0021/rot13-filter: add capability functions
> - t0021/rot13-filter: add packet_initialize()
> - t0021/rot13-filter: improve
Johannes Schindelin writes:
> Would you terribly mind adding a SQUASH??? with my suggested fix for
> PERL_NO_MAKEMAKER?
> ..
> Likewise, this needs a SQUASH??? to remove the uplink$X before
> (over-)writing uplink, to pass the test suite on Windows.
Surely I don't mind; please just send me somet
This heuristic has been the default since 2.14 so we should not confuse our
users by saying that it's experimental and off by default.
Signed-off-by: Carlos Martín Nieto
---
Documentation/diff-heuristic-options.txt | 5 -
Documentation/diff-options.txt | 7 ++-
2 files changed,
Hi Junio,
On Sun, 29 Oct 2017, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Would you terribly mind adding a SQUASH??? with my suggested fix for
> > PERL_NO_MAKEMAKER?
> > ..
> > Likewise, this needs a SQUASH??? to remove the uplink$X before
> > (over-)writing uplink, to pass the t
On Sun, Oct 29, 2017 at 09:05:44AM +0900, Junio C Hamano wrote:
> In short, unless you are a binary packager on a platform whose
> native shell is ksh and who refuses to depend on tools that are not
> default/native on the platform, you'd be OK?
Yes.
> > I'd recommend an explicit test for this.
if we fail to find a requested namespace, we should tell the user
which ones we know about, since we already do. this allows users to
feetch all namespaces by specifying a dummy namespace, failing, then
copying the list of namespaces in the config.
eventually, we should have a flag that allows fet
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
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
Hi,
For a few years now, work has been happening in a [GitHub issue] to
improve git's support for MediaWiki sites, which are implemented in
the contrib/mw-to-git/ module, mostly visible in the
git-remote-mediawiki command.
[GitHub issue]: https://github.com/Git-Mediawiki/Git-Mediawiki/issues/10
Reviewed-by: Antoine Beaupré
Signed-off-by: Antoine Beaupré
---
contrib/mw-to-git/git-remote-mediawiki.perl | 31 +++--
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.pe
mediawiki pages can have names longer than NAME_MAX (generally 255)
characters, which will fail on checkout. we simply strip out extra
characters, which may mean one page's content will overwrite another
(the last editing winning).
ideally, we would do a more clever system to find unique names, bu
On Sun, Oct 29, 2017 at 09:51:55AM +0900, Junio C Hamano wrote:
> "brian m. carlson" writes:
> > First, make sure your working directory is clean with no changes. Then,
> > remove the directory (by hand) or move it somewhere else. Then, run
> > "git add -u".
> >
> > That should allow you to comm
On Sat, Oct 28, 2017 at 09:36:05PM -0400, Eric Sunshine wrote:
> On Sat, Oct 28, 2017 at 2:12 PM, brian m. carlson
> wrote:
> > diff --git a/sha1_file.c b/sha1_file.c
> > @@ -39,6 +39,49 @@ const struct object_id empty_blob_oid = {
> > +static inline void git_hash_sha1_init(void *ctx)
> > +{
> > +
On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
> From: Kevin
>
> this introduces a new remote.origin.namespaces argument that is a
s/this/This/
> space-separated list of namespaces. the list of pages extract is then
s/the/The/
> taken from all the specified namespaces.
>
> Reviewed-
On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
> if we fail to find a requested namespace, we should tell the user
s/if/If/
> which ones we know about, since we already do. this allows users to
s/this/This/
Not sure what ", since we already do" means here.
> feetch all namespaces by
On Sat, Oct 28, 2017 at 09:44:07PM -0400, Eric Sunshine wrote:
> > diff --git a/cache.h b/cache.h
> > @@ -132,6 +133,8 @@ struct git_hash_algo {
> > extern const struct git_hash_algo hash_algos[GIT_HASH_NALGOS];
> >
> > +#define current_hash the_repository->hash_algo
>
> The all-lowercase name "c
mediawiki pages can have names longer than NAME_MAX (generally 255)
characters, which will fail on checkout. we simply strip out extra
characters, which may mean one page's content will overwrite another
(the last editing winning).
ideally, we would do a more clever system to find unique names, bu
mediawiki pages can have names longer than NAME_MAX (generally 255)
characters, which will fail on checkout. we simply strip out extra
characters, which may mean one page's content will overwrite another
(the last editing winning).
ideally, we would do a more clever system to find unique names, bu
sorry for the noise here, but the original patch didn't fix the length
in the right place. v2 fixed it in the library properly, but i forgot
to also include the length of the suffix. this should be good to go...
On 28/10/17 17:00, Johannes Schindelin wrote:
>
> Hi Jake,
>
> On Fri, 27 Oct 2017, Jacob Keller wrote:
>
>> From: Jacob Keller
>>
>> I noticed a failure with git rebase interactive mode which causes "exec"
>> commands to be run with GIT_DIR set. When GIT_DIR is in the environment,
>> then any
On 2017-10-29 13:24:03, Eric Sunshine wrote:
> On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
>> From: Kevin
>>
>> this introduces a new remote.origin.namespaces argument that is a
>
> s/this/This/
ack.
>> space-separated list of namespaces. the list of pages extract is then
>
> s/the
On 2017-10-29 13:34:31, Eric Sunshine wrote:
> On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
>> if we fail to find a requested namespace, we should tell the user
>
> s/if/If/
fixed.
>> which ones we know about, since we already do. this allows users to
>
> s/this/This/
>
> Not sure wh
On Sun, Oct 29, 2017 at 1:57 PM, brian m. carlson
wrote:
> On Sat, Oct 28, 2017 at 09:44:07PM -0400, Eric Sunshine wrote:
>> > +#define current_hash the_repository->hash_algo
>>
>> The all-lowercase name "current_hash" seems likely to conflict with a
>> variable name some day; the fact that it is
On Sun, Oct 29, 2017 at 03:02:20PM -0400, Eric Sunshine wrote:
> On Sun, Oct 29, 2017 at 1:57 PM, brian m. carlson
> wrote:
> > I can do CURRENT_HASH_ALGO or CURRENT_HASH instead if you think that's
> > an improvement. I originally omitted the "algo" portion to keep it
> > short.
>
> I don't hav
On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
> Subject: remote-mediawiki: allow using (Main) as a namespace and skip special
> namespaces
This patch is more difficult to review than it perhaps ought to be
since it is making multiple unrelated changes.
It's not clear from the descrip
On Sun, Oct 29, 2017 at 2:29 PM, Antoine Beaupré wrote:
> On 2017-10-29 13:24:03, Eric Sunshine wrote:
>> On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
>> So, the idea is that if the input has form "something:number", then
>> you want to look up "something" as a namespace name. Anythin
This series converts SubmittingPatches into AsciiDoc and builds it as
part of the technical documentation. The goal is to provide a format
that is more easily linkable both from our website and by others, as the
Git Project's patch submission standards are widely referenced and used
as examples.
Asciidoctor 1.5.0 and later have a compatibility mode that makes it more
compatible with some Asciidoc syntax, notably the single and double
quote handling. While this doesn't affect any of our current
documentation, it would be beneficial to enable this mode to reduce the
differences between Asci
The SubmittingPatches document is often cited by outside parties as an
example of good practices to follow, including logical, independent
commits; patch sign-offs; and sending patches to a mailing list.
Currently, people who want to cite a particular section tend to either
refer to it by name and
So I shared the patch some time ago (~2 years). Surprisingly its just
now getting attention. I guess some renewed interest in using mediawiki
with git. Myself, however, am no longer using mediawiki. Nor am I
completely clear on what the reasons were for using some variable or
another a couple of ye
Junio C Hamano writes:
> I still haven't brought myself to like the structure being passed by
> value and the singleton diff_flags_cleared thing, but I suspect that
> we may get used to them once we start using these. I dunno.
Just bikeshedding, but I just had to prepare an evil merge to add a
I've queued this from Dscho; please take it into consideration when
you reroll.
Thanks.
-- >8 --
From: Johannes Schindelin
Date: Sun, 29 Oct 2017 16:17:06 +0100
Subject: [PATCH] fixup! Git/Packet.pm: extract parts of t0021/rot13-filter.pl
for reuse
The patch introducing Git/Packet.pm forgot th
Jonathan Nieder writes:
> I have other changes to make when rerolling anyway (from Junio's
> review), so no need for a followup patch. Will fix this in the
> reroll today.
>
> Thanks for catching and diagnosing this, Dscho!
In the meantime, I've queued this from Dscho; please take it into
consi
RPS writes:
> git rm doesn't seem to be very useful without the use of shell
> wildcards, especially with the use of a .gitignore file. If a
> .gitignore file is used, the git rm command does not consider the
> .gitignore file, and errs out when an ignored file is present.
Do you mean
$
Johannes Schindelin writes:
> Let's make this more convenient for *both* of us. You can find one fixup
> in the `jr/ssh-wrappers` branch at https://github.com/dscho/git, and the
> second one at `cc/git-packet-pm`. Both should fast-forward from your
> branches of the same name.
Thanks.
I didn'
"brian m. carlson" writes:
> On Sun, Oct 29, 2017 at 09:51:55AM +0900, Junio C Hamano wrote:
>> "brian m. carlson" writes:
>> > First, make sure your working directory is clean with no changes. Then,
>> > remove the directory (by hand) or move it somewhere else. Then, run
>> > "git add -u".
>>
On 2017-10-29 15:49:28, Eric Sunshine wrote:
> On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
>> Subject: remote-mediawiki: allow using (Main) as a namespace and skip
>> special namespaces
>
> This patch is more difficult to review than it perhaps ought to be
> since it is making multip
"brian m. carlson" writes:
> On Sun, Oct 29, 2017 at 03:02:20PM -0400, Eric Sunshine wrote:
>> On Sun, Oct 29, 2017 at 1:57 PM, brian m. carlson
>> wrote:
>> > I can do CURRENT_HASH_ALGO or CURRENT_HASH instead if you think that's
>> > an improvement. I originally omitted the "algo" portion to
On 2017-10-29 23:08:00, Kevin wrote:
> So I shared the patch some time ago (~2 years). Surprisingly its just
> now getting attention. I guess some renewed interest in using mediawiki
> with git.
I think what's happening is that someone (ie. me :p) figured it was
about frigging time to actually sen
Phillip Wood writes:
> Just clearing GIT_DIR does not match the behavior of the shell version
> (tested by passing -p to avoid rebase--helper) as that passes GIT_DIR to
> exec commands if it has been explicitly set. I think that users that set
> GIT_DIR on the command line would expect it to be p
On 2017-10-29 15:49:28, Eric Sunshine wrote:
[...]
>> Reviewed-by: Antoine Beaupré
>> Signed-off-by: Antoine Beaupré
>> ---
>> diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
>> b/contrib/mw-to-git/git-remote-mediawiki.perl
>> @@ -264,16 +264,27 @@ sub get_mw_tracked_categories {
>> su
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
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 +-
On Sun, Oct 29, 2017 at 11:34 AM, Phillip Wood
wrote:
>
> Just clearing GIT_DIR does not match the behavior of the shell version
> (tested by passing -p to avoid rebase--helper) as that passes GIT_DIR to
> exec commands if it has been explicitly set. I think that users that set
> GIT_DIR on the co
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
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
This patch series tries to integrate all the feedback received in the
recent review from Eric Sunshine. It completely removes the confusing
changes to get_mw_namespace_id_for_page() because I believe they are
unrelated to the namespace support.
I also split up the last patch in 4 different patches
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
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
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
On Sun, Oct 29, 2017 at 7:26 PM, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> Just clearing GIT_DIR does not match the behavior of the shell version
>> (tested by passing -p to avoid rebase--helper) as that passes GIT_DIR to
>> exec commands if it has been explicitly set. I think that users
On Mon, Oct 30, 2017 at 11:13:41AM +0900, Junio C Hamano wrote:
> Is the plan to allow running with multiple hash algorithms in
> parallel? I thought what we want to see in the future codebase was
> to have the default hash algorithm used for everything except for a
> select few codepaths, and ass
Hi,
First thanks for the excellent feedback regarding the mediawiki
extension, it's great that obscure extensions like this see such
excellent reviews.
I think, however, it would be good to have a discussion about the future
of that extension in Git. The extension has a bit of a hybrid presence -
Jacob Keller writes:
> I am pretty confident we can fix it
I am sure we can eventually, but 3 hours is not enough soak time.
I am inclined to leave the fix for 2.15.1/2.16.0 instead of delaying
the release by 10 more days.
On Sun, Oct 29, 2017 at 10:11 PM, Antoine Beaupré wrote:
> On 2017-10-29 15:49:28, Eric Sunshine wrote:
>> On Sun, Oct 29, 2017 at 12:08 PM, Antoine Beaupré wrote:
>>> +foreach my $local_namespace (sort @tracked_namespaces) {
>>> +my ($mw_pages, $namespace_id);
>>> +if ($local
On Sun, Oct 29, 2017 at 10:43 PM, Antoine Beaupré wrote:
> On 2017-10-29 15:49:28, Eric Sunshine wrote:
>> This may be problematic since get_mw_namespace_id() may return undef
>> rather than a number, in which case Perl will complain.
>
> Actually, get_mw_namespace_id() doesn't seem like it can re
Dear Sir/Madam.
We are a fully registered loan agency, we give out loans to all in
need of help across the globe. Our loan takes a maximum of 1 working
days to get to approved to customers across the globe. We offer lowest
interest rate 4% and its fixed with best match loan including loans
for app
"brian m. carlson" writes:
Thanks. I personally prefer the plain-text original, but I do
understand the need to have a version with ids that you can tell
others to visit in their browsers. Assuming that this goes in the
right direction, here are a few comments.
> @@ -58,8 +65,9 @@ differs subs
Michael Haggerty writes:
> The files backend uses `ref_update::flags` for several internal flags.
> But those flags have no meaning to the packed backend. So when adding
> updates for the packed-refs transaction, only use flags that make
> sense to the packed backend.
>
> `REF_NODEREF` is part of
Michael Haggerty writes:
> +int is_packed_transaction_needed(struct ref_store *ref_store,
> + struct ref_transaction *transaction)
> +{
> + struct packed_ref_store *refs = packed_downcast(
> + ref_store,
> + REF_STORE_READ,
Michael Haggerty writes:
> Even after working with this code for years, I still see this constant
> name as "ref node ref". Rename it to make it's meaning clearer.
Yay ;-).
"Philip Oakley" writes:
> From: "Sergey Organov"
>> Is there anything like this:
>>
>> $ git merge b
>> [... lot of conflicts ...]
>> $ git re-merge -X ours -- x/ # Leaves 0 conflicts in x/
>> $ git re-merge -X theirs -- y/ # Leaves 0 conflicts in y/
>> [... resolve the rest of conflicts manua
Hi,
On Mon, Oct 30, 2017 at 1:38 AM, Junio C Hamano wrote:
> I've queued this from Dscho; please take it into consideration when
> you reroll.
Yeah, I was planning to add something like that, though in Dscho's
first email the patch was adding:
+modules += Git/Packet
and now it's adding:
> +mo
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
The latest feature release Git v2.15.0 is now available at the
usual places. It is comprised of 769 non-merge commits since
v2.14.0, contributed by 91 people, 28 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories
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.
You can find the changes described
On Sun, Oct 29, 2017 at 8:36 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> I am pretty confident we can fix it
>
> I am sure we can eventually, but 3 hours is not enough soak time.
>
> I am inclined to leave the fix for 2.15.1/2.16.0 instead of delaying
> the release by 10 more days.
73 matches
Mail list logo
