Re: [PATCH v3 23/23] cat-file: update of docs

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Update the docs for cat-file command. Some new formatting atoms added > because of reusing ref-filter code. > We do not support cat-file atoms in general formatting logic > (there is just the support for cat-file), that is why

Re: [PATCH v3 21/23] for-each-ref: tests for new atoms added

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Add tests for new formatting atoms: rest, deltabase, objectsize:disk. > rest means nothing and we expand it into empty string. > We need this atom for cat-file command. > Have plans to support deltabase and objectsize:disk further

Re: [PATCH v3 20/23] ref-filter: unifying formatting of cat-file opts

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > cat-file options are now filled by general logic. Yay. One puzzling thing: > diff --git a/ref-filter.c b/ref-filter.c > index 8d104b567eb7c..5781416cf9126 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -824,8 +824,12 @@

Re: [PATCH v3 17/23] ref-filter: make valid_atom general again

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Stop using valid_cat_file_atom, making the code more general. > Further commits will contain some tests, docs and > support of new features. Yay. -Peff

Re: [PATCH v3 16/23] ref-filter: make cat_file_info independent

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Remove connection between expand_data variable > in cat-file and in ref-filter. > It will help further to get rid of using expand_data in cat-file. I have to admit I'm confused at this point about what is_cat_file is for, or even

Re: [PATCH v3 15/23] cat-file: move skip_object_info into ref-filter

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Move logic related to skip_object_info into ref-filter, > so that cat-file does not use that field at all. I think this is going the wrong way. ref-filter should always do as little work as possible to fulfill the request. So it

Assalamu alaikum

2018-02-14 Thread Mr Ibrahim Zaki
Assalamu alaikum My name is Mr. Ibrahim Zaki, I am a staff member working with BCEAO BANK here in Ouagadougou, Burkina Faso. I want you to help me receive the sum of twenty-seven million two hundred dollars ($ 27,200,000) in your bank account. This fund was deposited in the bank here by a

Re: [PATCH v3 14/23] ref_filter: add is_atom_used function

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Delete all items related to split_on_whitespace from ref-filter > and add new function for handling the logic. > Now cat-file could invoke that function to implementing its logic. OK, this is a good direction. I think in a more

Re: [PATCH v3 13/23] ref-filter: get rid of mark_atom_in_object_info()

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Remove mark_atom_in_object_info() and create same logic > in terms of ref-filter style. This one is definitely a step in the right direction. In fact, this is what I would have expected to see in the beginning. It seems like this

Re: [PATCH v3 12/23] cat-file: start reusing populate_value()

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Move logic related to getting object info from cat-file to ref-filter. > It will help to reuse whole formatting logic from ref-filter further. This feels like another wrong-direction step, because we'd eventually expect

Re: [PATCH v3 09/23] cat-file: start use ref_array_item struct

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Moving from using expand_data to ref_array_item structure. > That helps us to reuse functions from ref-filter easier. This one feels weird. The point of a ref_array_item is for the caller to feed data into the ref-filter

Re: [PATCH v3 08/23] ref-filter: reuse parse_ref_filter_atom()

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Continue migrating formatting logic from cat-file to ref-filter. > Reuse parse_ref_filter_atom() for unifying all processes in ref-filter > and further removing of mark_atom_in_object_info(). OK, now it looks we're moving in a

Re: [PATCH v3 07/23] cat-file: start migrating formatting to ref-filter

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Move mark_atom_in_object_info() from cat-file to ref-filter and > start using it in verify_ref_format(). > It also means that we start reusing verify_ref_format() in cat-file. > > Start from simple moving of

Re: [PATCH v3 06/23] cat-file: split expand_atom() into 2 functions

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Split expand_atom() into 2 different functions, > mark_atom_in_object_info() prepares variable for further filling, > (new) expand_atom() creates resulting string. > Need that for further reusing of formatting logic from

Re: [PATCH v3 05/23] cat-file: move struct expand_data into ref-filter

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Need that for further reusing of formatting logic in cat-file. > Have plans to get rid of using expand_data in cat-file at all, > and use it only in ref-filter for collecting, formatting and printing > needed data. This seems

Re: [PATCH v3 04/23] ref-filter: make valid_atom as function parameter

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Make valid_atom as a function parameter, > there could be another variable further. > Need that for further reusing of formatting logic in cat-file.c. > > We do not need to allow users to pass their own valid_atom variable in >

Re: [PATCH v3 03/23] cat-file: reuse struct ref_format

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Start using ref_format struct instead of simple char*. > Need that for further reusing of formatting logic from ref-filter. Makes sense, and the patch itself looks correct. -Peff

Re: [PATCH v3 02/23] ref-filter: add return value to some functions

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Add return flag to format_ref_array_item(), show_ref_array_item(), > get_ref_array_info() and populate_value() for further using. > Need it to handle situations when item is broken but we can not invoke > die() because we are in

Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

2018-02-14 Thread Todd Zullinger
Hi Jonathan, Jonathan Nieder wrote: > Ævar Arnfjörð Bjarmason wrote: > [...] >> +++ b/perl/Git/LoadCPAN.pm >> @@ -0,0 +1,74 @@ > [...] >> +The Perl code in Git depends on some modules from the CPAN, but we >> +don't want to make those a hard requirement for anyone building from >> +source. > >

Re: [PATCH v3 01/23] ref-filter: get rid of goto

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Get rid of goto command in ref-filter for better readability. > > Signed-off-by: Olga Telezhnaia > Mentored-by: Christian Couder > Mentored by: Jeff King

Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

2018-02-14 Thread Todd Zullinger
Hi Ævar, Ævar Arnfjörð Bjarmason wrote: > +Git::LoadCPAN - Wrapper for loading modules from the CPAN (OS) or Git's own > copy > + > +=head1 DESCRIPTION > + > +The Perl code in Git depends on some modules from the CPAN, but we > +don't want to make those a hard requirement for anyone building

Re: git-rebase --undo-skip proposal

2018-02-14 Thread Jacob Keller
On Wed, Feb 14, 2018 at 5:50 PM, Psidium Guajava wrote: > 2018-02-14 22:53 GMT-02:00 Johannes Schindelin : >> Now, when is the next possible time you can call `git rebase --undo-skip`? > > What if the scope were reduced from `--undo-skip` to

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-14 Thread Sergey Organov
Hi Johannes, Johannes Schindelin writes: [...] >> > I'd not argue this way myself. If there are out-of-git-tree non-human >> > users that accept and tweak todo _generated_ by current "git rebase -p" >> > _command_, I also vote for a new option. >> > >> >> To be

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-14 Thread Sergey Organov
Johannes Schindelin writes: > Hi, > > On Tue, 13 Feb 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> > The wording is poor either way, but you are also not a native speaker so >> > we have to rely on, say, Eric to help

[PATCH] Makefile: generate Git(3pm) as dependency of the 'doc' and 'man' targets

2018-02-14 Thread SZEDER Gábor
Since commit 20d2a30f8f (Makefile: replace perl/Makefile.PL with simple make rules, 2017-12-10), the Git(3pm) man page is only generated as an indirect dependency of the 'install-doc' and 'install-man' Makefile targets. Consequently, if someone runs 'make man && sudo make install-man' (or their

Re: git-rebase --undo-skip proposal

2018-02-14 Thread Psidium Guajava
2018-02-14 22:53 GMT-02:00 Johannes Schindelin : > Now, when is the next possible time you can call `git rebase --undo-skip`? What if the scope were reduced from `--undo-skip` to `--undo-last-skip`? Also, further reduce the scope to only allow `--undo-last-skip` during

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-14 Thread Johannes Schindelin
Hi Sergey, On Tue, 13 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > > On Mon, 12 Feb 2018, Sergey Organov wrote: > > > >> Johannes Schindelin writes: > >> > > >> > On Fri, 9 Feb 2018, Sergey Organov wrote: > >> > >

Re: git-rebase --undo-skip proposal

2018-02-14 Thread Jacob Keller
On Wed, Feb 14, 2018 at 4:53 PM, Johannes Schindelin wrote: > Hi, > > On Wed, 14 Feb 2018, Psidium Guajava wrote: > >> On 2018-02-13 18:42 GMT-02:00 Stefan Beller wrote: >> > On Tue, Feb 13, 2018 at 12:22 PM, Psidium Guajava

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-14 Thread Johannes Schindelin
Hi Jake, On Tue, 13 Feb 2018, Jacob Keller wrote: > On Mon, Feb 12, 2018 at 11:15 PM, Sergey Organov wrote: > > > > Jacob Keller writes: > > > >> On Mon, Feb 12, 2018 at 12:39 PM, Johannes Schindelin > >> wrote: > >>> >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-14 Thread Johannes Schindelin
Hi, On Tue, 13 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > The wording is poor either way, but you are also not a native speaker so > > we have to rely on, say, Eric to help us out here. > > Likely, but why didn't you keep original wording

Re: git-rebase --undo-skip proposal

2018-02-14 Thread Johannes Schindelin
Hi, On Wed, 14 Feb 2018, Psidium Guajava wrote: > On 2018-02-13 18:42 GMT-02:00 Stefan Beller wrote: > > On Tue, Feb 13, 2018 at 12:22 PM, Psidium Guajava > > wrote: > > I think this could also be done with "git rebase --edit-todo", which brings > > up

Re: git-rebase --undo-skip proposal

2018-02-14 Thread Psidium Guajava
On 2018-02-13 18:42 GMT-02:00 Stefan Beller wrote: > On Tue, Feb 13, 2018 at 12:22 PM, Psidium Guajava wrote: > I think this could also be done with "git rebase --edit-todo", which brings > up the right file in your editor. Yeah that'd would only work if

[PATCH 1/2] apply: demonstrate a problem applying svn diffs

2018-02-14 Thread Johannes Schindelin
Subversion generates diffs that contain funny ---/+++ lines containing more than just the file names. Example: --- a/trunk/README (revision 4711) +++ /dev/null (nonexistent) Let's add a test case demonstrating that apply cannot handle the /dev/null line (although it can

[PATCH 2/2] apply: handle Subversion diffs with /dev/null gracefully

2018-02-14 Thread Johannes Schindelin
From: Tatyana Krasnukha Subversion generates diffs that can contain lines like this one: --- /dev/null (nonexistent) Let's teach Git's apply machinery to handle such a line gracefully. This fixes https://github.com/git-for-windows/git/isues/1489 Signed-off-by:

[PATCH 0/2] Teach `git apply` to accept Subversion-generated diffs

2018-02-14 Thread Johannes Schindelin
They are accepted already, almost. With one exception: the ---/+++ lines contain not only the file names, but continue with a TAB and then the revision (or "working copy" or "nonexistent") in parenthesis. We already handle these lines, except in the case of /dev/null. Let's handle the case

[PATCH 0/1] git status docs.

2018-02-14 Thread Stefan Beller
A user complained about the inaccurate documentation of `git-status --porcelain`. Fix the table showing the states. I found e92e9cd3c3 (Documentation improvements for the description of short format., 2010-04-23) which also linked to

[PATCH 1/1] Documentation/git-status: clarify status table for porcelain mode

2018-02-14 Thread Stefan Beller
It is possible to have the output ' A' from 'git status --porcelain' by adding a file using the '--intend-to-add' flag. Make this clear by adding the pattern in the table of the documentation. However the mode 'DM' (deleted in the index, modified in the working tree) is not possible in the

Re: [PATCH 8/8] perl: hard-depend on the File::{Temp,Spec} modules

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > --- a/perl/Git.pm > +++ b/perl/Git.pm > @@ -1324,8 +1324,9 @@ sub _temp_cache { > } > > sub _verify_require { > - eval { require File::Temp; require File::Spec; }; > - $@ and throw Error::Simple($@); > + require File::Temp; > + require

Re: [PATCH 7/8] gitweb: hard-depend on the Digest::MD5 5.8 module

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > gitweb/INSTALL | 3 +-- > gitweb/gitweb.perl | 17 + > 2 files changed, 6 insertions(+), 14 deletions(-) Makes sense, and I like the diffstat. [...] > +++

Re: [PATCH 6/8] git-send-email: unconditionally use Net::{SMTP,Domain}

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > The Net::SMTP and Net::Domain were both first released with perl > v5.7.3, since my d48b284183 ("perl: bump the required Perl version to > 5.8 from 5.6.[21]", 2010-09-24) we've depended on 5.8, so there's no > reason to conditionally require this anymore. > > This

Re: [PATCH 5/8] perl: update our copy of Mail::Address

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan > 23, 2018). This should be a trivial update[1] but it seems the version > Matthieu Moy imported in bd869f67b9 ("send-email: add and use a local > copy of Mail::Address", 2018-01-05) doesn't

Re: [PATCH 4/8] perl: update our ancient copy of Error.pm

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > The Error.pm shipped with Git as a fallback if there was no Error.pm > on the system was released in April 2006, there's been dozens of > releases since then, the latest at August 7, 2017, let's update to > that. Comma splices: s/, there's/. There's/ s/,

Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > Change the two wrappers to load from CPAN (local OS) or our own copy > to do so via the same codepath. nit: I think with s/to load/that load/ this will be easier to read. > I added the Error.pm wrapper in 20d2a30f8f ("Makefile: replace > perl/Makefile.PL with

Re: [PATCH 1/2] parse-options: expand $HOME on filename options

2018-02-14 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 14 2018, Nguyễn Thái Ngọc Duy jotted: > When you specify "--path ~/foo", the shell will automatically expand > ~/foo to $HOME/foo before it's passed to git. The expansion is not done > on "--path=~/foo". An experienced user sees the difference but it could > still be confusing for

Re: [PATCH 2/8] perl: move CPAN loader wrappers to another namespace

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > Move the Git::Error and Git::Mail::Address wrappers to the > Git::LoadCPAN::Loader::* namespace, e.g. Git::LoadCPAN::Error, that > module will then either load Error from CPAN (if installed on the OS), > or use Git::FromCPAN::Error. [...] > This also makes things

Re: [PATCH 1/8] perl: *.pm files should not have the executable bit

2018-02-14 Thread Jonathan Nieder
Hi, Ævar Arnfjörð Bjarmason wrote: > The Git::Mail::Address file added in bd869f67b9 ("send-email: add and > use a local copy of Mail::Address", 2018-01-05) had the executable bit > set, this should not be the case with *.pm files, it breaks nothing, > but is redundant and confusing as none of

Re: [PATCH v2 00/37] removal of some c++ keywords

2018-02-14 Thread Stefan Beller
On Wed, Feb 14, 2018 at 10:59 AM, Brandon Williams wrote: > One person was interested enough for me to go back through and also > rename all the paired 'old' variables to match the new names for the > variables which were named 'new'. The patches are: Reviewed-by: Stefan

[PATCH 8/8] perl: hard-depend on the File::{Temp,Spec} modules

2018-02-14 Thread Ævar Arnfjörð Bjarmason
Since my d48b284183 ("perl: bump the required Perl version to 5.8 from 5.6.[21]", 2010-09-24), we've depended on 5.8, so there's no reason to conditionally require File::Temp and File::Spec anymore. They were first released with perl versions v5.6.1 and 5.00405, respectively. This code was

[PATCH 7/8] gitweb: hard-depend on the Digest::MD5 5.8 module

2018-02-14 Thread Ævar Arnfjörð Bjarmason
Since my d48b284183 ("perl: bump the required Perl version to 5.8 from 5.6.[21]", 2010-09-24), we've depended on 5.8, so there's no reason to conditionally require Digest::MD5 anymore. It was released with perl v5.7.3. The initial introduction of the dependency in e9fdd74e53 ("gitweb: (gr)avatar

[PATCH 6/8] git-send-email: unconditionally use Net::{SMTP,Domain}

2018-02-14 Thread Ævar Arnfjörð Bjarmason
The Net::SMTP and Net::Domain were both first released with perl v5.7.3, since my d48b284183 ("perl: bump the required Perl version to 5.8 from 5.6.[21]", 2010-09-24) we've depended on 5.8, so there's no reason to conditionally require this anymore. This conditional loading was initially added in

[PATCH 5/8] perl: update our copy of Mail::Address

2018-02-14 Thread Ævar Arnfjörð Bjarmason
Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan 23, 2018). This should be a trivial update[1] but it seems the version Matthieu Moy imported in bd869f67b9 ("send-email: add and use a local copy of Mail::Address", 2018-01-05) doesn't correspond to any 2.19 version found on

[PATCH 4/8] perl: update our ancient copy of Error.pm

2018-02-14 Thread Ævar Arnfjörð Bjarmason
The Error.pm shipped with Git as a fallback if there was no Error.pm on the system was released in April 2006, there's been dozens of releases since then, the latest at August 7, 2017, let's update to that. This undoes a local hack we'd accumulated in 96bc4de85c ("Eliminate Scalar::Util usage

[PATCH 1/8] perl: *.pm files should not have the executable bit

2018-02-14 Thread Ævar Arnfjörð Bjarmason
The Git::Mail::Address file added in bd869f67b9 ("send-email: add and use a local copy of Mail::Address", 2018-01-05) had the executable bit set, this should not be the case with *.pm files, it breaks nothing, but is redundant and confusing as none of the other files have it, and it's never

[PATCH 3/8] perl: generalize the Git::LoadCPAN facility

2018-02-14 Thread Ævar Arnfjörð Bjarmason
Change the two wrappers to load from CPAN (local OS) or our own copy to do so via the same codepath. I added the Error.pm wrapper in 20d2a30f8f ("Makefile: replace perl/Makefile.PL with simple make rules", 2017-12-10), and shortly afterwards Matthieu Moy added a wrapper for Mail::Address in

[PATCH 2/8] perl: move CPAN loader wrappers to another namespace

2018-02-14 Thread Ævar Arnfjörð Bjarmason
Move the Git::Error and Git::Mail::Address wrappers to the Git::LoadCPAN::Loader::* namespace, e.g. Git::LoadCPAN::Error, that module will then either load Error from CPAN (if installed on the OS), or use Git::FromCPAN::Error. When I added the Error wrapper in 20d2a30f8f ("Makefile: replace

[PATCH 0/8] various perl fixes

2018-02-14 Thread Ævar Arnfjörð Bjarmason
I'd been meaning to submit 3/* once my Makefile.PL removal landed in master, but noticed a few more things along the way, including the issue fixed in 1/* which I just noted in , and while I was at it resolved some of my

[PATCH] t/known-leaky: add list of known-leaky test scripts

2018-02-14 Thread Martin Ågren
Here's what a list of known leaks might look like. It feels a bit awkward to post a known-incomplete list (I don't run all tests). Duy offered to pick up the ball if I gave up, maybe you could complete and post this as your own? :-? Even if I (or others) can't reproduce the complete list locally,

Re: [PATCH v2 08/37] apply: rename 'new' variables

2018-02-14 Thread Stefan Beller
On Wed, Feb 14, 2018 at 10:59 AM, Brandon Williams wrote: > Rename C++ keyword in order to bring the codebase closer to being able > to be compiled with a C++ compiler. > > Signed-off-by: Brandon Williams > --- > apply.c | 54

Re: [PATCH v2 06/37] diff: rename 'this' variables

2018-02-14 Thread Brandon Williams
On 02/14, Junio C Hamano wrote: > Brandon Williams writes: > > > Rename C++ keyword in order to bring the codebase closer to being able > > to be compiled with a C++ compiler. > > > > Signed-off-by: Brandon Williams > > --- > > The patch is not as bad as

Re: [PATCH v2 06/37] diff: rename 'this' variables

2018-02-14 Thread Junio C Hamano
Brandon Williams writes: > Rename C++ keyword in order to bring the codebase closer to being able > to be compiled with a C++ compiler. > > Signed-off-by: Brandon Williams > --- The patch is not as bad as renaming "this" and leaving "that" behind but in

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Junio C Hamano
Elijah Newren writes: >> Rename detection logic in "diff" family that is used in "merge" has >> learned to guess when all of x/a, x/b and x/c have moved to z/a, >> z/b and z/c, it is likely that x/d added in the meantime would also >> want to move to z/d by taking the hint

Re: [PATCH v8 00/29] Add directory rename detection to git

2018-02-14 Thread Stefan Beller
On Wed, Feb 14, 2018 at 10:51 AM, Elijah Newren wrote: > This patchset introduces directory rename detection to merge-recursive. See > https://public-inbox.org/git/20171110190550.27059-1-new...@gmail.com/ > for the first series (including design considerations, etc.) This

Re: [PATCH v2] Correct mispellings of ".gitmodule" to ".gitmodules"

2018-02-14 Thread Junio C Hamano
"Robert P. J. Day" writes: > There are a small number of misspellings, ".gitmodule", scattered > throughout the code base, correct them ... no apparent functional > changes. > > Documentation/technical/api-submodule-config.txt | 2 +- > contrib/subtree/git-subtree.txt

Re: "git add" with several pathspecS and one doesn't match

2018-02-14 Thread Junio C Hamano
Goffredo Baroncelli writes: > I am facing this issue: I am ADDing some file with several > pathspec, and one of these fails. The results is that no file is > added at all. This is a good example of a pretty conscious design decision to keep operations atomic/a-o-n when

Re: [PATCH] am: support --quit

2018-02-14 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Among the "in progress" commands, only git-am and git-merge do not > support --quit. Support --quit in git-am too. That's a strange way to phrase it, when the number of commands that know and do not know it are about the same. > --abort:: >

Re: Can we make git clone --recurse-submodules --shallow-submodules work for commits that are not on tags or branches

2018-02-14 Thread Stefan Beller
On Tue, Feb 13, 2018 at 9:06 PM, Ciro Santilli wrote: > I have a git repo with large submodules, notably the Linux kernel, and > shallow clone saves a lot of time. > > However, QEMU is also a submodule, which I don't control, and QEMU has > submodules which don't point to

Re: should "--recurse-submodule" be "--recurse-submodules"?

2018-02-14 Thread Stefan Beller
On Tue, Feb 13, 2018 at 4:30 PM, Robert P. J. Day wrote: > > also just noticed the following: > > Documentation/RelNotes/2.13.0.txt:489: * A few commands that recently learned > the "--recurse-submodule" > Documentation/RelNotes/2.12.0.txt:226: * "git push --dry-run >

Re: [PATCH v3 00/14] Serialized Git Commit Graph

2018-02-14 Thread Derrick Stolee
On 2/14/2018 1:27 PM, Stefan Beller wrote: On Wed, Feb 14, 2018 at 10:15 AM, Derrick Stolee wrote: There has been a lot of interesting discussion on this topic. Some of that involves some decently significant changes from v3, so I wanted to summarize my understanding of the

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Elijah Newren
On Tue, Feb 13, 2018 at 5:51 PM, Junio C Hamano wrote: > * en/rename-directory-detection (2018-01-31) 31 commits > - merge-recursive: ensure we write updates for directory-renamed file > - merge-recursive: avoid spurious rename/rename conflict from dir renames > - directory

[PATCH v2 35/37] tempfile: rename 'template' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- tempfile.c | 12 ++-- tempfile.h | 34 +- 2 files changed, 23 insertions(+), 23 deletions(-)

[PATCH v2 13/37] remote: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/remote.c | 66 1 file changed, 33 insertions(+), 33 deletions(-) diff --git

[PATCH v2 08/37] apply: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- apply.c | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git

[PATCH v2 14/37] combine-diff: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- combine-diff.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index

[PATCH v2 37/37] replace: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/replace.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git

[PATCH v2 07/37] apply: rename 'try' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- apply.c | 68 - 1 file changed, 34 insertions(+), 34 deletions(-) diff --git

[PATCH v2 36/37] trailer: rename 'template' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- trailer.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/trailer.c b/trailer.c index

[PATCH v2 17/37] diff: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff.c | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/diff.c

[PATCH v2 32/37] diff: rename 'template' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index 2de9c5ed2..5e46502cd

[PATCH v2 31/37] environment: rename 'template' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- cache.h | 2 +- environment.c | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cache.h

[PATCH v2 16/37] diff-lib: rename 'new' variable

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff-lib.c | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/diff-lib.c

[PATCH v2 30/37] init-db: rename 'template' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/init-db.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git

[PATCH v2 33/37] environment: rename 'namespace' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- environment.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/environment.c b/environment.c index

[PATCH v2 34/37] wrapper: rename 'template' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- git-compat-util.h | 4 ++-- wrapper.c | 40 2 files changed, 22 insertions(+), 22

Re: [PATCH] t/: correct obvious typo "detahced"

2018-02-14 Thread Stefan Beller
On Wed, Feb 14, 2018 at 1:08 AM, Robert P. J. Day wrote: > > Signed-off-by: Robert P. J. Day Thanks, Stefan > > --- > > diff --git a/t/t7409-submodule-detached-work-tree.sh > b/t/t7409-submodule-detached-work-tree.sh > index c20717181..fc018e363

[PATCH v2 18/37] diffcore-delta: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diffcore-delta.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/diffcore-delta.c

[PATCH v2 19/37] entry: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- entry.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/entry.c

[PATCH v2 26/37] split-index: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- split-index.c | 16 split-index.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git

[PATCH v2 29/37] unpack-trees: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- unpack-trees.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index

[PATCH v2 27/37] submodule: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- submodule.c | 30 +++--- submodule.h | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git

[PATCH v2 28/37] trailer: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- trailer.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/trailer.c

[PATCH v2 25/37] remote: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- remote.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/remote.c b/remote.c index

[PATCH v2 24/37] ref-filter: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- ref-filter.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index

[PATCH v2 21/37] imap-send: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- imap-send.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/imap-send.c b/imap-send.c index

[PATCH v2 22/37] line-log: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- line-log.c | 56 +++--- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git

[PATCH v2 23/37] read-cache: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- read-cache.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git

[PATCH v2 20/37] http: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- http.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/http.c b/http.c index 597771271..41cfa41a9

Re: [PATCH 5/6] test-hashmap: simplify alloc_test_entry

2018-02-14 Thread Junio C Hamano
Jeff King writes: > This function takes two ptr/len pairs, which implies that > they can be arbitrary buffers. But internally, it assumes > that each "ptr" is NUL-terminated at "len" (because we > memcpy an extra byte to pick up the NUL terminator). Makes quite a lot of sense.

[PATCH v2 06/37] diff: rename 'this' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- diff.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 0a9a0cdf1..d682d0d1f 100644

[PATCH v2 09/37] checkout: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- builtin/checkout.c | 196 ++--- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git

[PATCH v2 15/37] commit: rename 'new' variables

2018-02-14 Thread Brandon Williams
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams --- commit.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/commit.c b/commit.c index

  1   2   >