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", st
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
> > (merged to 'next' on 2016-
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. Instead,
> > > you'll
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, though I still think
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 here, though I still think converting t
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 might be nice to
(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)
> > > + list: avoid incompatibility
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 be
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.
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 huge, non-distributed system
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 to the list, yet somehow keep a strong tie with
>
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.
> >
> > Yes, and you'd be a
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 p
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 why the public-inbox is back
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 pointer (rather than
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 r
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 t
> 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:
From: Lars Schneider
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 accumulating by
> > > bein
> 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. Git needs
> to pass
> 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])
>>>
>>> I guess that this is inherited f
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,
> >
> > Gerrit is a huge, non-distribut
> 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, larsxschnei...@gmail.com pisze:
Sometimes p
> 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 you suggest?
>>
> 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, then it knows git d
> 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 don't want to ignore an
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, I agree with your argument from the usabili
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 it thinks "c.t" was not stag
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 clearly
> 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.
>>
>> I think the other issue is t
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 to a public repository and then told me to
> pull from there, that
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 were any patches, though. It does create some
> complications with serving clones/fe
Hi Duy,
On Fri, 5 Aug 2016, Duy Nguyen wrote:
> On the topic of fixup and squash and everything. Is anyone else
> annoyed that the commit title is taken for fixup!, squash!
> instructions?
I do not know about others, but I am not annoyed by those commit titles. I
think they make tons of sense.
Hi Richard,
On Fri, 5 Aug 2016, Richard Ipsum wrote:
> 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 noted
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 mentioning myself with a "Diagnosed-by:"
line.
FWIW today's `pu` does pas
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > With GCC 6, the strdup() function is declared with the "nonnull"
> > attribute, stating that it is not allowed to pass a NULL value as
> > parameter.
> >
> > In nedmalloc()'s reimplementation of strdup(), Po
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Ever since 66a155b (Enable output buffering in merge-recursive.,
> > 2007-01-14), we had a problem: When the merge failed in a fatal way, all
> > regular output was swallowed because we called die() and did
"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 series, and its presence makes it
>> clear where the series ends, but the topology does not tell
Hi Junio,
On Thu, 4 Aug 2016, Junio C Hamano wrote:
> Jeff King writes:
>
> > Like you, I have occasionally been bitten by Junio doing a fixup, and
> > then I end up re-rolling, and lose that fixup.
>
> ... which usually is caught when I receive the reroll, as I try to apply
> to the same base
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 this behavior disagrees with the specs at
>
> http://pubs.opengroup.org/onlinepubs/9699919799/f
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 this behavior disagrees with
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 e
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).
Sounds really good. Thanks.
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 least consistent
with the command
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 introduce packet_write_gently(
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)
> + fprintf(s->fp, "# b
> 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.
>>
>> I think the other issue is t
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
>> have called packet_fmt() or something, but tha
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.
> +
> +Header lines start
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 workflows drastically, I'd propose to go a
>> >> way[1] similar
Jeff Hostetler writes:
> +##
> +## Confirm output prior to initial commit.
> +##
> +
> +test_expect_success pre_initial_commit_0 '
Bikeshedding, but our codebase seems
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, but ...
+ if (!s->b
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 divs or something
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
+set of easy to parse opti
On 08/05/2016 02:12 PM, Junio C Hamano wrote:
Jeff Hostetler writes:
+##
+## Confirm output prior to initial commit.
+##
+
+test_expect_success pre_initial_commit_0
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 cares about. So that would
>>> invalidate the last paragraph here,
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 to a public repository and then told me to
pull f
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 do not contain the
> SHA-1s o
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, struct strbuf *dst,
> >> const char *cmd,
>
> - ${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 l
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 https://github.c
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 mails
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 has the submodules a
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 were any patche
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 to run
> > > in
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.
>
> Whenever we change dire
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 | 2 +-
3 files
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 --git a/builtin/su
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 a/merge-recursive.c b/
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.
Good motivations.
> Sig
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 line "unsubscribe git"
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
wt-status.c | 2 +-
1 file changed,
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 Jones
xdiff/xdiffi.c | 4 ++-
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 cod
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 reaction to that would be: you could push you patche
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 strbu
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 "--reference" and the
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 */
>> + }
>> [...]
>> + f
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 */
> >> + ...
> >> +
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 message
needs to describe what these str
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.
>> Currently we pass in --reference $referenc
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 not
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. This
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
> things that look like
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 made at .git/module
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 tool
>> like "rebase -i -p
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", 02-08-2016).
Thanks!
ATB,
Ra
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 st
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 be "--reference=foo",
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 helper accepts "--reference" "--reference=foo
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:
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 (with no alternates).
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
> things that look lik
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, and I do not know if
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 hurdle.
--
To unsubscri
> 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 is expected if ev
> 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 community anyways... I
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 mentioning myself with a "Diagno
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 details of new status fo
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 | 5
wt-status.c | 90
1 - 100 of 109 matches
Mail list logo
