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

On Thu, Aug 04, 2016 at 11:34:35PM +, Eric Wong wrote: > Junio C Hamano wrote: > > [Graduated to "master"] > > > * ew/http-walker (2016-07-18) 4 commits > > (merged to 'next' on 2016-07-18 at a430a97) > > + list: avoid incompatibility with *BSD sys/queue.h > >

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

On Thu, Aug 04, 2016 at 02:12:22PM -0700, Junio C Hamano wrote: > > 2. Minor fixups noticed by maintainer, fixed while applying. > > This includes different kinds of things: > > a) Trivially correct fixes given in other people's review. > > b) Minor fixups by the maintainer, to code.

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

Johannes Sixt writes: > Oh! This is a typo. You meant to check s2 for NULL. > > And the declaration for s2 should remain, of course. Yeah, the moral of the story is don't try to do something you do not usually do X-<. The second try (the log message is the same). I do not know

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

On Thu, Aug 04, 2016 at 11:24:32PM -0700, Junio C Hamano wrote: > I do not know if we want to worry about st_add(1, strlen(s1)) > overflow around here, though. > [...] > + size_t len = strlen(s1) + 1; I wondered that, too, but I don't think it's possible. To overflow the size_t with "+1",

Re: [PATCH 6/7] trace: disable key after write error

On Thu, Aug 04, 2016 at 05:22:44PM -0400, Jeff King wrote: > On Thu, Aug 04, 2016 at 01:45:11PM -0700, Junio C Hamano wrote: > > > Jeff King writes: > > > > > If we get a write error writing to a trace descriptor, the > > > error isn't likely to go away if we keep writing.

Re: [PATCH 3/7] trace: use warning() for printing trace errors

On Thu, Aug 04, 2016 at 02:28:09PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I wondered if that would then let us drop set_warn_routine(), but it > > looks like there are other warning() calls it cares about. So that would > > invalidate the last paragraph here,

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

Hi Eric, On Thu, 4 Aug 2016, Eric Wong wrote: > Stefan Beller wrote: > > On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin > > wrote: > > > I guess I have no really good idea yet, either, how to retain the ease of > > > access of sending mails

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

Eric Wong writes: > Yay! This finally introduces the Linux kernel linked list > into git. I'm not sure if it's worth the effort to introduce > cleanup commits to start using it in places where we already > have doubly-linked list implementations: > > (+Cc Nicolas and Lukas) > *

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

On Fri, Aug 05, 2016 at 08:02:31AM +, Eric Wong wrote: > > I just introduced another doubly-linked list in [1]. It adds some MRU > > features on top of the list, but it could in theory be built on top of a > > generic doubly-linked list. > > Yes, and you'd be avoiding the extra mallocs and

Re: [PATCH 3/7] trace: use warning() for printing trace errors

On Thu, Aug 4, 2016 at 11:28 PM, Junio C Hamano wrote: > Jeff King writes: > >> I wondered if that would then let us drop set_warn_routine(), but it >> looks like there are other warning() calls it cares about. So that would >> invalidate the last paragraph

Re: [PATCH 4/7] trace: cosmetic fixes for error messages

On Thu, Aug 04, 2016 at 01:42:12PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I think it would be nicer to still to print: > > > > warning: first line > > warning: second line > > > > etc. We do that for "advice:", but not the rest of the vreportf > > functions. It

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

Hi Stefan, On Thu, 4 Aug 2016, Stefan Beller wrote: > On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin > wrote: > > > >> If we were to change our workflows drastically, I'd propose to go a > >> way[1] similar to notedb in Gerrit, or git-series, > > > > Gerrit is a

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

Jeff King wrote: > On Fri, Aug 05, 2016 at 08:02:31AM +, Eric Wong wrote: > > > > I just introduced another doubly-linked list in [1]. It adds some MRU > > > features on top of the list, but it could in theory be built on top of a > > > generic doubly-linked list. > > > >

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

On Fri, Aug 05, 2016 at 08:26:30AM +, Eric Wong wrote: > > I'm not sure which mallocs you mean. I allocate one struct per node, > > which seems like a requirement for a linked list. If you mean holding an > > extra list struct around an existing pointer (rather than shoving the > > prev/next

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

(Fixed Nico's address) Jeff King wrote: > On Thu, Aug 04, 2016 at 11:34:35PM +, Eric Wong wrote: > > Junio C Hamano wrote: > > > [Graduated to "master"] > > > > > * ew/http-walker (2016-07-18) 4 commits > > > (merged to 'next' on 2016-07-18 at a430a97) >

Re: [PATCH] git mv: do not keep slash in `git mv dir non-existing-dir/`

Johannes Schindelin writes: > Please note that t7001 *specifically* tests for the opposite of what you > want, then ;-) Yes, I know. I am torn. It seems "mv A B/" (not "git mv") when B does not exist does the same "wrong" thing, so the existing behaviour is at

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

Hi Peff, On Wed, 3 Aug 2016, Jeff King wrote: > On Wed, Aug 03, 2016 at 09:08:48AM -0700, Junio C Hamano wrote: > > > > However, I could imagine that we actually want this to be more > > > extensible. After all, all you are doing is to introduce a new > > > rebase -i command that does nothing

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

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 after a weekday (unless I forget to turn on my laptop, > that is).

Re: [PATCH v4 01/12] pkt-line: extract set_packet_header()

Lars Schneider writes: > However, besides the bogus performance argument I introduced that function > to allow packet writs to fail using the `gentle` parameter: > http://public-inbox.org/git/D116610C-F33A-43DA-A49D-0B33958822E5%40gmail.com/ > > Would you be OK if I

Re: [PATCH v4 6/8] status: print branch info with --porcelain=v2 --branch

Jeff Hostetler writes: > /* > + * Print branch information for porcelain v2 output. These lines > + * are printed when the '--branch' parameter is given. > + * > + *# branch.oid > + *# branch.head Just bikeshedding, but ... > + if (!s->branch) > +

Re: [PATCH] git mv: do not keep slash in `git mv dir non-existing-dir/`

Hi Junio, On Fri, 5 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > When calling `rename("dir", "non-existing-dir/")` on Linux, it silently > > succeeds, stripping the trailing slash of the second argument. > > > > This is all good and dandy but

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

Jeff King wrote: > On Fri, Aug 05, 2016 at 08:26:30AM +, Eric Wong wrote: > > > > I'm not sure which mallocs you mean. I allocate one struct per node, > > > which seems like a requirement for a linked list. If you mean holding an > > > extra list struct around an existing

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

Johannes Schindelin wrote: Agreed on all above points :> > On Thu, 4 Aug 2016, Eric Wong wrote: > > Of course, centralized systems are unacceptable to me; > > and with that I'll never claim any network service I run > > will be reliable :) > > Hehehe. I guess that's

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: > > The ultimate goal is to be able to run filter drivers faster for both `clean` > and `smudge` operations. This is done by starting filter driver once per > git command invocation, instead of once per file being processed.

Re: [ANNOUNCE] more archives of this list

On Fri, Aug 05, 2016 at 05:28:05AM -0400, Jeff King wrote: > On Sun, Jul 10, 2016 at 12:48:13AM +, Eric Wong wrote: > > > Very much a work-in-progress, but NNTP and HTTP/HTTPS sorta work > > based on stuff that is on gmane and stuff I'm accumulating by > > being a subscriber. > > I checked

Re: [PATCH v3 03/10] pkt-line: add packet_flush_gentle()

> On 02 Aug 2016, at 21:56, Torsten Bögershausen wrote: > > On Sun, Jul 31, 2016 at 11:45:08PM +0200, Lars Schneider wrote: >> >>> On 31 Jul 2016, at 22:36, Torstem Bögershausen wrote: >>> >>> >>> Am 29.07.2016 um 20:37 schrieb larsxschnei...@gmail.com:

Re: [ANNOUNCE] more archives of this list

Jeff King wrote: > On Fri, Aug 05, 2016 at 05:28:05AM -0400, Jeff King wrote: > > > On Sun, Jul 10, 2016 at 12:48:13AM +, Eric Wong wrote: > > > > > Very much a work-in-progress, but NNTP and HTTP/HTTPS sorta work > > > based on stuff that is on gmane and stuff I'm

Re: [ANNOUNCE] more archives of this list

On Sun, Jul 10, 2016 at 12:48:13AM +, Eric Wong wrote: > Very much a work-in-progress, but NNTP and HTTP/HTTPS sorta work > based on stuff that is on gmane and stuff I'm accumulating by > being a subscriber. I checked this out when you posted it, and have been using it the past few weeks. I

Re: [ANNOUNCE] more archives of this list

Jeff King wrote: > On Fri, Aug 05, 2016 at 05:28:05AM -0400, Jeff King wrote: > > I do find it visually a little harder to navigate through threads, > > because there's not much styling there, and the messages seem to run > > into one another. I don't know if a border around the

Re: [PATCH v4 7/8] git-status.txt: describe --porcelain=v2 format

Jeff Hostetler writes: > +Porcelain Format Version 2 > +~~ > + > +Version 2 format adds more detailed information about the state of > +the worktree and changed items. Version 2 also defines an extensible > +set of easy to parse optional headers.

Re: [PATCH v4 8/8] status: tests for --porcelain=v2

Jeff Hostetler writes: > +## > +## Confirm output prior to initial commit. > +## > + > +test_expect_success pre_initial_commit_0 '

Re: [PATCH v4 01/12] pkt-line: extract set_packet_header()

> On 04 Aug 2016, at 18:14, Junio C Hamano wrote: > > Jeff King writes: > >> The cost of write() may vary on other platforms, but the cost of memcpy >> generally shouldn't. So I'm inclined to say that it is not really worth >> micro-optimizing the interface.

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

Hi Johannes, On Fri, Aug 5, 2016 at 1:20 AM, Johannes Schindelin wrote: > Hi Stefan, > > On Thu, 4 Aug 2016, Stefan Beller wrote: > >> On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin >> wrote: >> > >> >> If we were to change our

Re: [PATCH v4 6/8] status: print branch info with --porcelain=v2 --branch

On 08/05/2016 01:01 PM, Junio C Hamano wrote: Jeff Hostetler writes: /* + * Print branch information for porcelain v2 output. These lines + * are printed when the '--branch' parameter is given. + * + *# branch.oid + *# branch.head Just bikeshedding,

Re: [PATCH v4 7/8] git-status.txt: describe --porcelain=v2 format

On 08/05/2016 01:50 PM, Junio C Hamano wrote: Jeff Hostetler writes: +Porcelain Format Version 2 +~~ + +Version 2 format adds more detailed information about the state of +the worktree and changed items. Version 2 also defines an extensible

Re: [PATCH v4 8/8] status: tests for --porcelain=v2

On 08/05/2016 02:12 PM, Junio C Hamano wrote: Jeff Hostetler writes: +## +## Confirm output prior to initial commit. +## +

Re: [PATCH v4 01/12] pkt-line: extract set_packet_header()

On Fri, Aug 5, 2016 at 10:31 AM, Lars Schneider wrote: > >> On 04 Aug 2016, at 18:14, Junio C Hamano wrote: >> >> signature would look more like write(2) and deserve to be called >> packet_write() but unfortunately the name is taken by what should >>

Re: [PATCH v3 01/10] pkt-line: extract set_packet_header()

> On 03 Aug 2016, at 22:05, Jakub Narębski wrote: > > [This response might have been invalidated by v4] > > W dniu 01.08.2016 o 13:33, Lars Schneider pisze: >>> On 30 Jul 2016, at 12:30, Jakub Narębski wrote: > #define hex(a) (hexchar[(a) & 15]) >>>

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

On Thu, Aug 04, 2016 at 09:42:18AM -0700, Stefan Beller wrote: > On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin > wrote: > > > >> If we were to change our workflows drastically, I'd propose to > >> go a way[1] similar to notedb in Gerrit, or git-series, > > > >

Re: [PATCH v3 02/10] pkt-line: add direct_packet_write() and direct_packet_write_data()

> On 03 Aug 2016, at 22:12, Jakub Narębski wrote: > > [This response might have been invalidated by v4] > > W dniu 01.08.2016 o 14:00, Lars Schneider pisze: >>> On 30 Jul 2016, at 12:49, Jakub Narębski wrote: >>> W dniu 30.07.2016 o 01:37,

Re: obsolete index in wt_status_print after pre-commit hook runs

Am 04.08.2016 um 12:45 nachm. schrieb Junio C Hamano : > Andrew Keller writes: > >> In summary, I think I prefer #2 from a usability point of view, however I’m >> having >> trouble proving that #1 is actually *bad* and should be disallowed. > > Yeah,

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

> On 04 Aug 2016, at 00:46, Jeff King wrote: > > On Wed, Aug 03, 2016 at 11:48:00PM +0200, Lars Schneider wrote: > >> OK. Is this the v2 discussion you are referring to? >> http://public-inbox.org/git/1461972887-22100-1-git-send-email-sbeller%40google.com/ >> >> What format do

Re: [PATCH v4 07/12] run-command: add clean_on_exit_handler

> On 04 Aug 2016, at 01:15, Jeff King wrote: > > On Thu, Aug 04, 2016 at 01:09:57AM +0200, Lars Schneider wrote: > >>> Or better yet, do not require a shutdown at all. The filter sees EOF and >>> knows there is nothing more to do. If we are in the middle of an >>> operation,

Re: [PATCH v3 10/10] convert: add filter..process option

> On 04 Aug 2016, at 12:18, Jakub Narębski wrote: > > ... + + sigchain_push(SIGPIPE, SIG_IGN); >>> >>> Hmmm... ignoring SIGPIPE was good for one-shot filters. Is it still >>> O.K. for per-command persistent ones? >> >> Very good question. You are right... we

Re: [PATCH 3/7] trace: use warning() for printing trace errors

Christian Couder writes: > On Thu, Aug 4, 2016 at 11:28 PM, Junio C Hamano wrote: >> Jeff King writes: >> >>> I wondered if that would then let us drop set_warn_routine(), but it >>> looks like there are other warning() calls it

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

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, > >> size_t len, > >> + int fd,

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

On Mon, Sep 17, 2001 at 10:00:00AM +, Stefan Beller wrote: > But both send-email as well as mail-patch-series as well as git-series > are all about the *sending* part. Not about the back and forth part, i.e. > these don't deal with: "here is a fixup on top". And by that I mean > receiving

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

From: "Duy Nguyen" On Wed, Aug 3, 2016 at 6:07 PM, Johannes Schindelin wrote: It would be a totally different matter, of course, if you used the branches I publish via my GitHub repository, added fixup! and squash! commits, published the result

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

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 code > submissions contain that base commit. But they still

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

> - ${reference:+--reference "$reference"} \ > + ${reference:+"$reference"} \ Note how this changed the API of the submodule--helper. Currently we pass in --reference $reference and $reference consists of the string "--reference" and the actual reference. So it looked

git fatal error on fetching

Debian Testing with v4.5.5-1 kernel, git v2.8.1. I seem to have a broken git setup somehow on this machine - I'm currently testing the ability to fetch PRs from Github following [0], e.g. testing with a PR on dattobd[1]: git clone

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

Stefan Beller writes: > Currently when cloning a superproject with --recursive and --reference > only the superproject learns about its alternates. The submodules are > cloned independently, which may incur lots of network costs. > > Assume that the reference repository

Re: [PATCH] t5533: make it pass on case-sensitive filesystems

Hi Junio, On Thu, 4 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The newly-added test case wants to commit a file "c.t" (note the lower > > case) when a previous test case already committed a file "C.t". This > > confuses Git to the point that

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

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. Signed-off-by: Rene Scharfe --- builtin/fmt-merge-msg.c | 2 +- http.c | 2 +- sequencer.c |

[PATCH] use CHILD_PROCESS_INIT to initialize automatic variables

Initialize struct child_process variables already when they're defined. That's shorter and saves a function call. Signed-off-by: Rene Scharfe --- builtin/submodule--helper.c | 3 +-- builtin/worktree.c | 6 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff

[PATCH] merge-recursive: use STRING_LIST_INIT_NODUP

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. Signed-off-by: Rene Scharfe --- merge-recursive.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

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

Stefan Beller writes: > Allow users to pass in multiple references, just as clone accepts multiple > references as well. As these are passed-thru to the underlying "git clone", this change makes perfect sense to me. Will queue. -- To unsubscribe from this list: send the

Re: [ANNOUNCE] more archives of this list

On Fri, Aug 05, 2016 at 05:04:27PM +0200, Duy Nguyen wrote: > On Fri, Aug 5, 2016 at 11:28 AM, Jeff King wrote: > > There was discussion a long time ago about storing a common zlib > > dictionary in the packfile and using it for all of the objects. I don't > > recall whether there

Re: [ANNOUNCE] more archives of this list

On Fri, Aug 05, 2016 at 06:19:57PM +, Eric Wong wrote: > Jeff King wrote: > > On Fri, Aug 05, 2016 at 05:28:05AM -0400, Jeff King wrote: > > > I do find it visually a little harder to navigate through threads, > > > because there's not much styling there, and the messages seem

Re: [PATCH 1/6] t7408: modernize style

Stefan Beller writes: > 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. > >

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

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 new shell but > use the -C flag in Git to execute in the correct directory.

[PATCH] wt-status.c: mark a file-local symbol as static

Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jh/status-v2-porcelain' branch, could you please squash this into the relevant patch (37f7104f, "status: print per-file porcelain v2 status data", 02-08-2016). Thanks! ATB, Ramsay Jones

Re: [PATCH v4 5/8] status: print per-file porcelain v2 status data

On 08/05/2016 05:02 PM, Jeff King wrote: On Tue, Aug 02, 2016 at 10:12:14AM -0400, Jeff Hostetler wrote: +static void wt_porcelain_v2_print_unmerged_entry( + struct string_list_item *it, + struct wt_status *s) +{ + struct wt_status_change_data *d = it->util; + const

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

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 > "result=success" packet is expected if everything went well. > > packet:

Re: [PATCH v4 5/8] status: print per-file porcelain v2 status data

On Fri, Aug 5, 2016 at 2:14 PM, Jeff King wrote: > > Unfortunately it is hard for me to test a one-off, as running it locally > is a complete pain. Stefan set it up long ago to pull "pu" and email out > the results from their central servers, so I just scan those emails for >

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

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 please > record René as author, maybe

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

On Fri, Aug 5, 2016 at 2:31 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> I thought about rolling it as a strict bugfix; but the bug is shaded by the >> inverse bug in the helper, so the user would never see an issue. > > Ahh, OK, because the

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

> On 05 Aug 2016, at 23:34, Torsten Bögershausen wrote: > > 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 >> "result=success" packet

Re: [PATCH v4 07/12] run-command: add clean_on_exit_handler

> On 05 Aug 2016, at 23:19, Torsten Bögershausen wrote: > > On 2016-08-05 15.08, Lars Schneider wrote: > > [] >> Yeah it could do that. But then the filter cannot do things like >> modifying the index after the fact... however, that might be considered >> nasty by the Git

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

Stefan Beller writes: > 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 the update command succeeds as usual

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

From: Jeff Hostetler Print per-file information in porcelain v2 format. Signed-off-by: Jeff Hostetler --- wt-status.c | 285 +++- 1 file changed, 284 insertions(+), 1 deletion(-) diff

[PATCH v5 1/9] status: rename long-format print routines

From: Jeff Hostetler Rename the various wt_status_print*() routines to be wt_longstatus_print*() to make it clear that these routines are only concerned with the normal/long status output and reduce developer confusion as other status formats are added in the future.

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

From: Jeff Hostetler Collect extra per-file data for porcelain V2 format. The output of `git status --porcelain` leaves out many details about the current status that clients might like to have. This can force them to be less efficient as they may need to launch

[PATCH v5 7/9] git-status.txt: describe --porcelain=v2 format

From: Jeff Hostetler Update status manpage to include information about porcelain v2 format. Signed-off-by: Jeff Hostetler --- Documentation/git-status.txt | 126 +-- 1 file changed, 122 insertions(+), 4

[PATCH v5 3/9] status: support --porcelain[=]

From: Jeff Hostetler Update --porcelain argument to take optional version parameter to allow multiple porcelain formats to be supported in the future. The token "v1" is the default value and indicates the traditional porcelain format. (The token "1" is an alias for

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

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 >> "result=success" packet is expected if everything went

Re: [PATCH] wt-status.c: mark a file-local symbol as static

On 08/05/2016 04:55 PM, Ramsay Jones wrote: Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jh/status-v2-porcelain' branch, could you please squash this into the relevant patch (37f7104f, "status: print per-file porcelain v2 status data",

[PATCH v5 6/9] status: print branch info with --porcelain=v2 --branch

From: Jeff Hostetler Expand porcelain v2 output to include branch and tracking branch information. This includes the commit id, the branch, the upstream branch, and the ahead and behind counts. Signed-off-by: Jeff Hostetler --- builtin/commit.c

[PATCH v5 9/9] status: unit tests for --porcelain=v2

From: Jeff Hostetler Test porcelain v2 status format. Signed-off-by: Jeff Hostetler --- t/t7064-wtstatus-pv2.sh | 597 1 file changed, 597 insertions(+) create mode 100755 t/t7064-wtstatus-pv2.sh

[PATCH v5 0/9] status: V2 porcelain status

From: Jeff Hostetler This patch series adds porcelain V2 format to status. This provides detailed information about file changes and about the current branch. The new output is accessed via: git status --porcelain=v2 [--branch] This v5 patch series addresses all

[PATCH v5 2/9] status: cleanup API to wt_status_print

From: Jeff Hostetler Refactor the API between builtin/commit.c and wt-status.[ch]. Hide the details of the various wt_*status_print() routines inside wt-status.c behind a single (new) wt_status_print() routine. Eliminate the switch statements from builtin/commit.c. Allow

[PATCH v5 8/9] test-lib-functions.sh: Add lf_to_nul

From: Jeff Hostetler Add lf_to_nul() function to test-lib-functions. Signed-off-by: Jeff Hostetler --- t/test-lib-functions.sh | 4 1 file changed, 4 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index

[PATCH] xdiffi.c: mark some file-local symbols as static

Signed-off-by: Ramsay Jones --- Hi Michael, If you need to re-roll your 'mh/diff-indent-heuristic' branch, could you please squash this into the relevant patch (e199b6e2, "diff: improve positioning of add/delete blocks in diffs", 04-08-2016). Thanks! ATB, Ramsay

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

Stefan Beller wrote: > On Fri, Aug 5, 2016 at 1:20 AM, Johannes Schindelin > wrote: > > Yet another option would be to have a tool that integrates with the Git > > repository of the Git mailing list represented by public-inbox. > > So my first

[PATCH] merge: use string_list_split() in add_strategies()

Call string_list_split() for cutting a space separated list into pieces instead of reimplementing it based on struct strategy. The attr member of struct strategy was not used split_merge_strategies(); it was a pure string operation. Also be nice and clean up once we're done splitting; the old

Re: [PATCH v4 5/8] status: print per-file porcelain v2 status data

On Tue, Aug 02, 2016 at 10:12:14AM -0400, Jeff Hostetler wrote: > +static void wt_porcelain_v2_print_unmerged_entry( > + struct string_list_item *it, > + struct wt_status *s) > +{ > + struct wt_status_change_data *d = it->util; > + const struct cache_entry *ce; > + struct

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

Stefan Beller writes: >> - ${reference:+--reference "$reference"} \ >> + ${reference:+"$reference"} \ > > Note how this changed the API of the submodule--helper. > Currently we pass in --reference $reference > and $reference consists of the string

Re: [PATCH v4 5/8] status: print per-file porcelain v2 status data

On Fri, Aug 5, 2016 at 2:02 PM, Jeff King wrote: > On Tue, Aug 02, 2016 at 10:12:14AM -0400, Jeff Hostetler wrote: >> + switch (d->stagemask) { >> + case 1: key = "DD"; break; /* both deleted */ >> + ... >> + case 7: key = "UU"; break; /* both modified */ >> + } >>

Re: [PATCH v4 5/8] status: print per-file porcelain v2 status data

On Fri, Aug 05, 2016 at 02:09:48PM -0700, Junio C Hamano wrote: > On Fri, Aug 5, 2016 at 2:02 PM, Jeff King wrote: > > On Tue, Aug 02, 2016 at 10:12:14AM -0400, Jeff Hostetler wrote: > >> + switch (d->stagemask) { > >> + case 1: key = "DD"; break; /* both deleted */ > >> +

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

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 super_reference : 1;' field in some structure, but that is not what is happening. The log

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

On Fri, Aug 5, 2016 at 2:06 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> - ${reference:+--reference "$reference"} \ >>> + ${reference:+"$reference"} \ >> >> Note how this changed the API of the submodule--helper. >>

Re: storing cover letter of a patch series?

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. > > * When you updated an existing topic, you tell a tool > like "rebase -i -p" to recreate "lit" branch on top of > the mainline.

Re: [PATCH v4 07/12] run-command: add clean_on_exit_handler

On 2016-08-05 15.08, Lars Schneider wrote: [] > Yeah it could do that. But then the filter cannot do things like > modifying the index after the fact... however, that might be considered > nasty by the Git community anyways... I am thinking about dropping > this patch in the next roll as it is

Re: [PATCH v4 5/8] status: print per-file porcelain v2 status data

On Fri, Aug 5, 2016 at 2:14 PM, Jeff King wrote: > > Unfortunately it is hard for me to test a one-off, as running it locally > is a complete pain. Stefan set it up long ago to pull "pu" and email out > the results from their central servers, so I just scan those emails for >

Re: storing cover letter of a patch series?

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. >> >> * When you updated an existing topic, you tell a

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

On Fri, Aug 5, 2016 at 12:47 PM, Junio C Hamano wrote: > * You want the "clone" command above with "--recursive" to do "the >right thing". That is, the clone of the superproject borrows >from /var/cache/super.git local mirror, and the clone of xyzzy >that would be

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

Stefan Beller writes: > I thought about rolling it as a strict bugfix; but the bug is shaded by the > inverse bug in the helper, so the user would never see an issue. Ahh, OK, because the helper accepts "--reference" "--reference=foo" as a OPT_STRING whose value happens to

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

Stefan Beller writes: > The plan for other layouts might be > > git submodule update --reference-dir /var/cache/ That is not a plan for "other layouts", but a plan for "the other layout that was mentioned as a possibility". As I said, both layouts are equally plausible,

Re: [PATCH v4 5/8] status: print per-file porcelain v2 status data

On Fri, Aug 5, 2016 at 2:43 PM, Stefan Beller wrote: > cov-build --dir cov-int make For this you need to download their analytic tool and put it in your $PATH. Let me see if I need to update the tool so it enables finding more potential issues. So that was an initial

[PATCH] git mv: do not keep slash in `git mv dir non-existing-dir/`

When calling `rename("dir", "non-existing-dir/")` on Linux, it silently succeeds, stripping the trailing slash of the second argument. This is all good and dandy but this behavior disagrees with the specs at http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html that state

  1   2   >