Re: storing cover letter of a patch series?

On Fri, Aug 05, 2016 at 08:39:58AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > On Thu, Sep 10, 2015 at 11:39:49AM -0700, Junio C Hamano wrote: > >> The problem with "empty commit trick" is that it is a commit whose > >> sole purpose is to describe the

Re: [PATCH v2 5/5] convert: add filter..process option

> On 05 Aug 2016, at 20:55, Eric Wong wrote: > > Lars Schneider wrote: >>> On 27 Jul 2016, at 11:41, Eric Wong wrote: >>> larsxschnei...@gmail.com wrote: +static int apply_protocol_filter(const char *path, const char *src,

Re: [ANNOUNCE] more archives of this list

Jeff King wrote: > Thanks. That's definitely an improvement. I still think the styling > could go further, but I don't expect you to do it. It's something I may > look into, but I should probably try to clear out my backlog of > "to-review" patches before I go off spending time on

Re: Un-paged commit messages in git filter-branch's commit-filter?

On Mon, 1 Aug 2016 19:24:29 -0400 Jeff King wrote: > So could it be that your lines actually _are_ broken in the git objects, > but "%s" and other tools try to salvage them as a single subject? YES! :) Thanks so much! I was apparently ignoring this trivial explanation because I

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Hi Stefan, just quickly (i.e. addressing only one point, will try to address more at a later date) because I want to be mostly offline this weekend: On Fri, 5 Aug 2016, Stefan Beller wrote: > On Fri, Aug 5, 2016 at 1:20 AM, Johannes Schindelin > wrote: > > > > I

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Hi Philip, On Fri, 5 Aug 2016, Philip Oakley wrote: > In the same vein, I always want,with my workflow, to use "fixup! > ". Good news for you: this is already supported. See here: https://github.com/git/git/blob/v2.9.2/git-rebase--interactive.sh#L786-L796 Ciao, Dscho -- To unsubscribe from

[PATCHv2 5/6] submodule update: add super-reference flag

When we have a another clone of a superproject, we may want to mirror the submodules using alternates. Introduce an option `--super-reference` that let's a user point to another superproject, which is assumed to have the same structure as the one they are running the "submodule update" command

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Hi Eric, On Fri, 5 Aug 2016, Eric Wong wrote: > Johannes Schindelin wrote: > > On Thu, 4 Aug 2016, Stefan Beller wrote: > > > git send-email/format-patch recently learned to include a base commit > > > > You may have noticed that my mail-patch-series.sh-generated

[PATCH] use strbuf_add_unique_abbrev() for adding short hashes

Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs instead of taking detours through find_unique_abbrev() and its static buffer. This is shorter and a bit more efficient. Signed-off-by: Rene Scharfe --- builtin/checkout.c | 3 +-- pretty.c | 13

Re: [PATCH 2/2] nedmalloc: work around overzealous GCC 6 warning

Hi Junio, On Fri, 5 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This setup will from now on test next & pu in the Git for Windows SDK, and > > rebase Git for Windows' current master to git.git's maint, master, next & > > pu, every morning

Re: [PATCH 5/6] submodule update: add super-reference flag

On Fri, Aug 5, 2016 at 2:16 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- > > That's a bit sketchy description. From the title, I expected that > we would see one additional 'unsigned

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Junio C Hamano wrote: > Somebody mentioned "configuring it is hard--why does the user have > to know SMTP subtleties", and that may be a valid complaint against > the primary part of send-email. The solution for that is not to > discard it with bathwater, but make it just as

Rename detection within in files WAS: [PATCH 2/6] t7408: merge short tests, factor out testing method

When moving code around, we usually get large chunks of text. If the contributor is not 100% trustworthy, we need to review all the code without much intelectual joy. Essentially the reviewer is just making sure the parts of the text are the same. I'd like to propose a new addition to the diff

[PATCH] archive-tar: make write_extended_header() void

The function write_extended_header() only ever returns 0. Simplify it and its caller by dropping its return value, like we did with write_global_extended_header() earlier. Signed-off-by: Rene Scharfe --- archive-tar.c | 15 +-- 1 file changed, 5 insertions(+), 10

Re: [PATCH 2/2] nedmalloc: work around overzealous GCC 6 warning

Am 05.08.2016 um 23:57 schrieb Junio C Hamano: Johannes Schindelin writes: Hi Junio & René, On Thu, 4 Aug 2016, Junio C Hamano wrote: Let's try it this way. How about this as a replacement? I like it (with the if (s2) test intead of if (s1), of course). But

Re: [PATCH 2/6] t7408: merge short tests, factor out testing method

On Fri, Aug 5, 2016 at 1:45 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Tests consisting of one line each can be consolidated to have fewer tests >> to run as well as fewer lines of code. >> >> When having just a few git commands, do not create a

Forward declaration of enum iterator_selection?

When refs.c is being compiled, the only mention of enum iterator_selection is in this piece of code pulled in from refs-internal.h (have a look at the preprocessed code): typedef enum iterator_selection ref_iterator_select_fn( struct ref_iterator *iter0, struct ref_iterator

Re: [PATCH v4 11/12] convert: add filter..process option

On 2016-08-06 00.06, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> On 2016-08-03 18.42, larsxschnei...@gmail.com wrote: >>> The filter is expected to respond with the result content in zero >>> or more pkt-line packets and a flush packet at the end. Finally, a >>>

[PATCHv2 6/6] clone: reference flag is used for submodules as well

When giving a --reference while also giving --recurse, the alternates for the submodules are assumed to be in the superproject as well. In case they are not, we error out when cloning the submodule. However we error out completely, we did not record the alternates yet, so a following update

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

From: "Johannes Schindelin" Hi Philip, On Fri, 5 Aug 2016, Philip Oakley wrote: In the same vein, I always want,with my workflow, to use "fixup! ". Good news for you: this is already supported. See here:

Re: [PATCH v4 11/12] convert: add filter..process option

> On 06 Aug 2016, at 00:27, Jeff King wrote: > > On Fri, Aug 05, 2016 at 03:06:28PM -0700, Junio C Hamano wrote: > >> Torsten Bögershausen writes: >> >>> On 2016-08-03 18.42, larsxschnei...@gmail.com wrote: The filter is expected to respond with the result

Re: [PATCH v4 11/12] convert: add filter..process option

> On 06 Aug 2016, at 14:14, Jeff King wrote: > > On Sat, Aug 06, 2016 at 01:55:23PM +0200, Lars Schneider wrote: > >>> And I expect it makes the lives of the client >>> easier to get a code up front, before it starts taking steps to handle >>> what it _thinks_ is probably a

[PATCHv2 1/6] t7408: modernize style

No functional change intended. This commit only changes formatting to the style we recently use, e.g. starting the body of a test with a single quote on the same line as the header, and then having the test indented in the following lines. Whenever we change directories, we do that in subshells.

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

On Fri, Aug 05, 2016 at 05:24:14PM +0200, Johannes Schindelin wrote: [snip] > > > > This "unified review storage format" really does seem to be the missing > > piece. > > FWIW I do not think so. The real trick will be to come up with an > improvement to the process that lets Junio and Peff

[PATCHv2 4/6] submodule--helper update-clone: allow multiple references

Allow the user to pass in multiple references to update_clone. Currently this is only internal API, but once the shell script is replaced by a C version, this is needed. This fixes an API bug between the shell script and the helper. Currently the helper accepts "--reference" "--reference=foo" as

[PATCHv2 3/6] submodule--helper module-clone: allow multiple references

Allow users to pass in multiple references, just as clone accepts multiple references as well. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/builtin/submodule--helper.c

Re: Designing the filter process protocol (was: Re: [PATCH v3 10/10] convert: add filter..process option)

> On 03 Aug 2016, at 20:30, Jakub Narębski wrote: > > ... > > > 2. HANDSHAKE (INITIALIZATION) > > Next, there is deciding on and designing the handshake between Git (between > Git command) and the filter driver process. With the > `filter..process` > solution the driver

[PATCHv2 0/6] git clone: Marry --recursive and --reference

v2: * fixed the p1,2 cleanups * added documentation to patches 5,6 * improved commit message in v4 Thanks, Stefan v1: Currently when cloning a superproject with --recursive and --reference only the superproject learns about its alternates. The submodules are cloned independently,

Re: [PATCH v4 11/12] convert: add filter..process option

On Sat, Aug 06, 2016 at 01:55:23PM +0200, Lars Schneider wrote: > > And I expect it makes the lives of the client > > easier to get a code up front, before it starts taking steps to handle > > what it _thinks_ is probably a valid response. > > I am not sure I can follow you here. Which actor are

Re: [PATCH v6 16/16] merge-recursive: flush output buffer even when erroring out

Johannes Schindelin writes: > On Thu, 4 Aug 2016, Junio C Hamano wrote: > >> OK. Even though I really wanted to see somebody else review this >> series as well, I finished reading it through one more time before >> that happened, which is unfortunate because I think

Re: [PATCH v4 11/12] convert: add filter..process option

On Fri, Aug 05, 2016 at 03:06:28PM -0700, Junio C Hamano wrote: > Torsten Bögershausen writes: > > > On 2016-08-03 18.42, larsxschnei...@gmail.com wrote: > >> The filter is expected to respond with the result content in zero > >> or more pkt-line packets and a flush packet at the

[PATCHv2 2/6] t7408: merge short tests, factor out testing method

Tests consisting of one line each can be consolidated to have fewer tests to run as well as fewer lines of code. When having just a few git commands, do not create a new shell but use the -C flag in Git to execute in the correct directory. Signed-off-by: Stefan Beller ---

Re: [PATCH v5 5/9] status: print per-file porcelain v2 status data

Jeff Hostetler writes: > From: Jeff Hostetler > > Print per-file information in porcelain v2 format. > > Signed-off-by: Jeff Hostetler > --- Relative to the previous version, the renaming of variables (current,

Re: storing cover letter of a patch series?

Junio C Hamano writes: > On Fri, Aug 5, 2016 at 2:20 PM, Martin Fick wrote: >> On Friday, August 05, 2016 08:39:58 AM you wrote: >>> * A new topic, when you merge it to the "lit" branch, you >>> describe the cover as the merge commit message. >>> >>> *

Re: [PATCHv2 5/6] submodule update: add super-reference flag

Stefan Beller writes: > When we have a another clone of a superproject, we may want to > mirror the submodules using alternates. Introduce an option > `--super-reference` that let's a user point to another superproject, > which is assumed to have the same structure as the one

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Johannes Schindelin writes: > The problem is not Perl, but how fiddly it is to set up. And that you lose > all the niceties of an email client (e.g. when you want to add a comment > before the diff stat that is not intended to become a part of the commit > message).

Re: [PATCHv2 4/6] submodule--helper update-clone: allow multiple references

Stefan Beller writes: > Allow the user to pass in multiple references to update_clone. > Currently this is only internal API, but once the shell script is > replaced by a C version, this is needed. > > This fixes an API bug between the shell script and the helper. > Currently

Re: [PATCH 2/6] t7408: merge short tests, factor out testing method

Stefan Beller writes: >>> -test_expect_success 'that reference gets used with add' ' >>> - ( >>> - cd super/sub && >>> - echo "0 objects, 0 kilobytes" > expected && >>> - git count-objects > current && >>> - diff expected

Re: [PATCH v5 4/9] status: collect per-file data for --porcelain=v2

Jeff Hostetler writes: > if (ce_stage(ce)) { > d->index_status = DIFF_STATUS_UNMERGED; > d->stagemask |= (1 << (ce_stage(ce) - 1)); > + /* > + * Don't bother setting

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

Stefan Beller writes: > Some submodules in the referenced superproject may not be there, > (they are just not initialized/cloned/checked out), which yields > an error for now. Perhaps you can teach "git clone --reference" an new option (--reference-if-able) to do this?

Re: [PATCH v2 5/5] convert: add filter..process option

> >>> larsxschnei...@gmail.com wrote: > +static int apply_protocol_filter(const char *path, const char *src, > size_t len, Lars Schneider wrote: > > On 05 Aug 2016, at 20:55, Eric Wong wrote: > > Perhaps using xsize_t in git-compat-util.h