Re: How to re-merge paths differently?

"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/

Re: [PATCH 6/7] refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`

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 ;-).

Re: [PATCH v2 2/2] files-backend: don't rewrite the `packed-refs` file unnecessarily

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, > +

Re: [PATCH 1/7] files_transaction_prepare(): don't leak flags to packed transaction

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. > >

Re: [PATCH 2/2] Documentation: convert SubmittingPatches to AsciiDoc

"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. >

END OF YEAR OFFER

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

Re: [PATCH 4/4] remote-mediawiki: allow using (Main) as a namespace and skip special namespaces

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()

Re: [PATCH 4/4] remote-mediawiki: allow using (Main) as a namespace and skip special namespaces

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

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

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.

future of the mediawiki extension?

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

Re: [PATCH v2 3/4] Integrate hash algorithm support with repo setup

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

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

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

[PATCH v2 0/7] remote-mediawiki: add namespace support

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

[PATCH 7/7] remote-mediawiki: show progress while fetching namespaces

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:

[PATCH 2/7] remote-mediawiki: allow fetching namespaces with spaces

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é ---

[PATCH 4/7] remote-mediawiki: skip virtual namespaces

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

[PATCH 5/7] remote-mediawiki: support fetching from (Main) namespace

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

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

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

[PATCH 1/7] remote-mediawiki: add namespace support

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é

[PATCH 3/7] remote-mediawiki: show known namespace choices on failure

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

[PATCH 6/7] remote-mediawiki: process namespaces in order

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é ---

Re: [PATCH 4/4] remote-mediawiki: allow using (Main) as a namespace and skip special namespaces

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

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

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

Re: [PATCH 1/4] remote-mediawiki: add namespace support

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

Re: [PATCH v2 3/4] Integrate hash algorithm support with repo setup

"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 >> >

Re: [PATCH 4/4] remote-mediawiki: allow using (Main) as a namespace and skip special namespaces

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 >

Re: git rm VERY slow for directories with many files.

"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

Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)

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

Re: Wildcards with git rm

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

Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'

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;

Re: [PATCH 0/6] Create Git/Packet.pm

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

Re: [PATCH 3/3] diff: convert flags to be stored in bitfields

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

Re: [PATCH 1/4] remote-mediawiki: add namespace support

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

[PATCH 0/2] Convert SubmittingPatches to AsciiDoc

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.

[PATCH 1/2] Documentation: enable compat-mode for Asciidoctor

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

[PATCH 2/2] Documentation: convert SubmittingPatches to AsciiDoc

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

Re: [PATCH 1/4] remote-mediawiki: add namespace support

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

Re: [PATCH 4/4] remote-mediawiki: allow using (Main) as a namespace and skip special namespaces

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

Re: [PATCH v2 3/4] Integrate hash algorithm support with repo setup

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

Re: [PATCH v2 3/4] Integrate hash algorithm support with repo setup

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

Re: [PATCH 3/4] remote-mediawiki: show known namespace choices on failure

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 > >

Re: [PATCH 1/4] remote-mediawiki: add namespace support

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

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

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

[no subject]

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...

[PATCH v3] remote-mediawiki: limit filenames to legal

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,

[PATCH v2] remote-mediawiki: limit filenames to legal

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,

Re: [PATCH v2 3/4] Integrate hash algorithm support with repo setup

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

Re: [PATCH 3/4] remote-mediawiki: show known namespace choices on failure

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. >

Re: [PATCH 1/4] remote-mediawiki: add namespace support

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

Re: [PATCH v2 2/4] Add structure representing hash algorithm

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

Re: git rm VERY slow for directories with many files.

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". > > >

[PATCH] remote-mediawiki: limit filenames to legal

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,

[PATCH 4/4] remote-mediawiki: allow using (Main) as a namespace and skip special namespaces

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

[PATCH 0/4] WIP: git-remote-media wiki namespace support

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

[PATCH 3/4] remote-mediawiki: show known namespace choices on failure

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

[PATCH 2/4] remote-mediawiki: allow fetching namespaces with spaces

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é ---

[PATCH 1/4] remote-mediawiki: add namespace support

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é

Re: [PATCH 1/2] t1404: add a bunch of tests of D/F conflicts

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.

Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)

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 > >

[PATCH] diff: --indent-heuristic is no longer experimental

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

Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)

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

Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)

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:

Re: [PATCH v3] 0/4 fsmonitor fixes

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

Re: [PATCH v2 0/4] fsmonitor fixes

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

Re: [PATCH v2 1/4] fsmonitor: Set the PWD to the top of the working tree

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 >

Re: [PATCH 3/3] builtin/describe: describe blobs

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

Re: [PATCH 3/3] builtin/describe: describe blobs

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

Hallo Freund

-- Ich beabsichtige, Ihnen einen Teil meines Vermögens als freiwillige finanzielle Spende an Sie zu geben. Reagieren Sie, um teilzunehmen. Wang Jianlin Wanda Gruppe