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

Hi Junio, On Fri, 5 Aug 2016, Junio C Hamano wrote: > Jeff Hostetler writes: > > > if (ce_stage(ce)) { > > d->index_status = DIFF_STATUS_UNMERGED; > > d->stagemask |= (1 << (ce_stage(ce) - 1)); > > +

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

Hi, On Sat, 6 Aug 2016, Eric Wong wrote: > 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

Re: [PATCH] use strbuf_addstr() instead of strbuf_addf() with "%s"

Hi René, On Fri, 5 Aug 2016, René Scharfe wrote: > Call strbuf_addstr() for adding a simple string to a strbuf instead of > using the heavier strbuf_addf(). This is shorter and documents the > intent more clearly. Looks obviously good, thanks! Ciao, Dscho

Re: [PATCH] merge-recursive: use STRING_LIST_INIT_NODUP

Hi René, On Fri, 5 Aug 2016, René Scharfe wrote: > Initialize a string_list right when it's defined. That's shorter, saves > a function call and makes it more obvious that we're using the NODUP > variant here. Thank you! I guess I never updated the code after the _INIT* macros were introduced.

Re: [PATCH] use strbuf_add_unique_abbrev() for adding short hashes

Hi René, On Sat, 6 Aug 2016, René Scharfe wrote: > 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. And less error-prone. It is also a thing I need

Re: What's cooking in git.git (Aug 2016, #02; Thu, 4)

Hi Junio, On Thu, 4 Aug 2016, Junio C Hamano wrote: > * js/import-tars-hardlinks (2016-08-03) 1 commit > - import-tars: support hard links > > "import-tars" fast-import script (in contrib/) used to ignore a > hardlink target and replaced it with an empty file, which has been > corrected to

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

Am 06.08.2016 um 01:26 schrieb Stefan Beller: 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.

Re: storing cover letter of a patch series?

On Sun, Aug 07, 2016 at 08:12:23AM +0300, Michael S. Tsirkin wrote: > On Fri, Aug 05, 2016 at 08:39:58AM -0700, Junio C Hamano wrote: > > * When you updated an existing topic, you tell a tool like "rebase > >-i -p" to recreate "lit" branch on top of the mainline. This > >would give you

Re: storing cover letter of a patch series?

On Sun, Aug 7, 2016 at 7:12 AM, Michael S. Tsirkin wrote: > 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

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

> On 06 Aug 2016, at 10:58, Johannes Schindelin > wrote: > > 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: >

[PATCH] .mailmap: use Christian Couder's gmail address

Signed-off-by: Christian Couder --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index a714e69..a408ac6 100644 --- a/.mailmap +++ b/.mailmap @@ -33,6 +33,7 @@ Cheng Renquan Chris Shoemaker

Re: [PATCH] apply: mark some file-local symbols static

Hi Dscho, On Wed, Aug 3, 2016 at 4:37 PM, Johannes Schindelin wrote: > Hi Christian, > > On Wed, 3 Aug 2016, Christian Couder wrote: > >> Now there are different options to fix this: >> >> 1) remove the symbols in 9f87c22 ("apply: refactor `git apply` option >>

Re: [PATCH v2 1/2] format-patch: Add a config option format.from to set the default for --from

On Mon, Aug 08, 2016 at 12:54:41AM -0400, Jeff King wrote: > On Sun, Aug 07, 2016 at 06:42:07PM -1000, Josh Triplett wrote: > > > > Drop trailing comma after the last enum definition (trailing comma > > > after the last element in an array is OK, though). > > > > I realize this code didn't get

Re: [PATCH v2 1/2] format-patch: Add a config option format.from to set the default for --from

On Mon, Aug 01, 2016 at 02:18:47PM -0700, Junio C Hamano wrote: > Josh Triplett writes: > > +enum from { > > + FROM_AUTHOR, > > + FROM_USER, > > + FROM_VALUE, > > Drop trailing comma after the last enum definition (trailing comma > after the last element in an array

Re: [PATCH 1/2] format-patch: Add a config option format.from to set the default for --from

On Mon, Aug 01, 2016 at 01:32:49PM -0700, Junio C Hamano wrote: > Josh Triplett writes: > > > +static char *from; > > static const char *signature = git_version_string; > > static const char *signature_file; > > static int config_cover_letter; > > @@ -807,6 +808,17 @@

Re: [PATCH v2 1/2] format-patch: Add a config option format.from to set the default for --from

On Sun, Aug 07, 2016 at 06:42:07PM -1000, Josh Triplett wrote: > > Drop trailing comma after the last enum definition (trailing comma > > after the last element in an array is OK, though). > > I realize this code didn't get included in the final version, but for > future reference, what's the

Re: [PATCH v2 1/2] format-patch: Add a config option format.from to set the default for --from

On Sun, Aug 07, 2016 at 07:02:18PM -1000, Josh Triplett wrote: > > Portability; some compilers choke on it. C89 allows trailing commas in > > array initialization but _not_ in enums. Most compilers allow it anyway > > (though gcc complains with -Wpedantic). > > > > This definitely broke the

Re: [PATCH v2 1/2] format-patch: Add a config option format.from to set the default for --from

Josh Triplett writes: > I'd actually seriously considered this exact approach, which I preferred > as well, but I'd discarded it because I figured it'd get rejected. > Given your suggestion, and Junio's comment, I'll go with this version. Sorry, but your response is soo

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

Eric Wong writes: >> > Not a big deal (no need to resend for this one alone), but let's >> > make the above properly formatted, i.e. >> > >> >if (ce_stage(ce)) { >> >... >> >} else { >> >... >> >}

Re: [PATCH v2 1/2] format-patch: Add a config option format.from to set the default for --from

On Sun, Aug 07, 2016 at 06:59:09PM -0700, Junio C Hamano wrote: > Josh Triplett writes: > > > I'd actually seriously considered this exact approach, which I preferred > > as well, but I'd discarded it because I figured it'd get rejected. > > Given your suggestion, and

Re: [PATCH v2 1/2] format-patch: Add a config option format.from to set the default for --from

On Mon, Aug 01, 2016 at 01:38:47PM -0400, Jeff King wrote: > On Sat, Jul 30, 2016 at 12:11:11PM -0700, Josh Triplett wrote: > > > +enum from { > > + FROM_AUTHOR, > > + FROM_USER, > > + FROM_VALUE, > > +}; > > + > > +static void set_from(enum from type, const char *value) > > +{ > > +

Re: [PATCH] use strbuf_add_unique_abbrev() for adding short hashes

On Sun, Aug 07, 2016 at 10:53:34AM +0200, Johannes Schindelin wrote: > On Sat, 6 Aug 2016, René Scharfe wrote: > > > 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

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

On Sat, Aug 06, 2016 at 04:35:38PM +0200, René Scharfe wrote: > 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. Obviously correct, and much nicer to read. Thanks.

Re: Forward declaration of enum iterator_selection?

On 05/08/16 23:26, Johannes Sixt wrote: > 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

You there

-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

Johannes Schindelin wrote: > On Fri, 5 Aug 2016, Junio C Hamano wrote: > > Jeff Hostetler writes: > > > } > > > - else > > > + else { > > > d->index_status = DIFF_STATUS_ADDED; > > > +