Jeff King wrote:
> I am more concerned with Windows, which may not compile your original
> patch at all.
The code I introduced in e47a8583a20256851e7fc882233e3bd5bf33dc6e
("enable SO_KEEPALIVE for connected TCP sockets" Dec 2011)
didn't trigger the addition of any new #ifdef guards. I think we'r
IIRC, this was the longest period of absence you've taken in the last
4 years: ~20 days.
Welcome back.
--
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
Jonathan Nieder wrote:
> What's cooking in git.git (Oct 2013, #02; Mon, 14)
Could you have a look at the minor f-e-r enhancement I posted? [1]
Thanks.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/235483
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body
On Tue, Oct 15, 2013 at 04:58:14AM +, Eric Wong wrote:
> > Subject: http: use curl's tcp keepalive if available
> [...]
> Tested-by: Eric Wong
> on curl 7.21.0 and 7.26.0, confirmed via strace:
>
> setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, [1], 4) = 0
>
> I can also confirm 7.26.0 adds
Jeff King wrote:
> On Mon, Oct 14, 2013 at 11:38:39PM +, Eric Wong wrote:
>
> > I wanted it to work as older curl first (since I noticed this
> > on an old server). But your patch on top of mine looks reasonable,
> > thanks.
>
> Makes sense. Here it is with a real commit message (on top of
On Mon, 14 Oct 2013, Jeff King wrote:
> By the way, I'm sorry I haven't looked more carefully at the packv4
> patches yet. I am excited about it, but I've just got a long queue of
> other things (and because it's big and challenging, it's easy to put
> off).
;-)
While I consider the format prett
On Mon, Oct 14, 2013 at 09:45:12PM -0400, Nicolas Pitre wrote:
> > No, as far as I know, it is a novel idea. When we were discussing commit
> > caching a while back, Shawn suggested slicing trees on boundaries and
> > store delta instructions that were pure "change this entry", "add this
> > entry
On Mon, 14 Oct 2013, Jeff King wrote:
> On Sat, Oct 12, 2013 at 10:42:17AM +0700, Nguyen Thai Ngoc Duy wrote:
>
> > Just wondering if this has been considered and dropped before.
> > Currently we use try_delta() for every object including trees. But
> > trees are special. All tree entries must be
On Tue, Oct 15, 2013 at 07:49:57AM +0700, Nguyen Thai Ngoc Duy wrote:
> I see this as pack-objects peformance improvements only. If we could
> make pack-objects run like 10% faster (even only with -adf), then it
> may be worth trying. The 10% is a total guess though as I haven't
> checked how much
On Tue, Oct 15, 2013 at 7:19 AM, Jeff King wrote:
> On Sat, Oct 12, 2013 at 10:42:17AM +0700, Nguyen Thai Ngoc Duy wrote:
>
>> Just wondering if this has been considered and dropped before.
>> Currently we use try_delta() for every object including trees. But
>> trees are special. All tree entries
On Sat, Oct 12, 2013 at 10:42:17AM +0700, Nguyen Thai Ngoc Duy wrote:
> Just wondering if this has been considered and dropped before.
> Currently we use try_delta() for every object including trees. But
> trees are special. All tree entries must be unique and sorted. That
> helps simplify diff al
What's cooking in git.git (Oct 2013, #02; Mon, 14)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Tying up loose ends before the hand-off.
On Sun, Oct 13, 2013 at 10:00:12PM +0200, Torsten Bögershausen wrote:
> On 05.10.13 21:48, Torsten Bögershausen wrote:
> > On 2013-10-03 03.31, Jeff King wrote:
> >>
> >> http://article.gmane.org/gmane.comp.version-control.git/235473
> What do we think about extending the test a little bit:
I n
On Mon, Oct 14, 2013 at 11:38:39PM +, Eric Wong wrote:
> I wanted it to work as older curl first (since I noticed this
> on an old server). But your patch on top of mine looks reasonable,
> thanks.
Makes sense. Here it is with a real commit message (on top of the
ew/keepalive topic).
-- >8
On Mon, Oct 14, 2013 at 05:25:29PM +0200, Nicolas Vigier wrote:
> The reason that I looked at this documentation in the first place was
> that I was looking at adding an option '-S[], --gpg-sign[=]'
> to git-rebase, similar to the option in git-commit, so that rebased
> commits can be signed. In gi
The option to gpg sign a merge commit is available but was not
documented. Use wording from the git-commit(1) manpage.
Signed-off-by: Nicolas Vigier
---
Documentation/git-merge.txt | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-merge.txt b/Documentatio
Jeff King wrote:
> On Mon, Oct 14, 2013 at 05:27:39AM +, Eric Wong wrote:
> > Daniel Stenberg wrote:
> > > On Sat, 12 Oct 2013, Eric Wong wrote:
> > >
> > > >This is a follow up to commit
> > > >e47a8583a20256851e7fc882233e3bd5bf33dc6e (enable SO_KEEPALIVE for
> > > >connected TCP sockets).
Jeff King wrote:
> On Mon, Oct 14, 2013 at 06:40:05PM +, Eric Wong wrote:
>
> > > arnaud.brej...@gmail.com wrote:
> > >
> > > > Signed-off-by: Arnaud Brejeon gmail.com>
> > >
> > > Thanks.
> > >
> > > Can you say a little more about the context? Do you run a script that
> > > wants to pa
On Mon, Oct 14, 2013 at 03:45:42PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Yeah, you are right[1]. I'm happy to re-roll. I wonder if we even need
> > to worry about a compatibility wrapper. We are already doing pointer
> > manipulations, and it is probably just as readable to roll
Ramsay Jones wrote:
> These patches don't have too much in common, hence the subject
> line, except perhaps that 4 of them fix sparse warnings.
Thanks. These look good.
I tweaked the descriptions a bit to focus on what sparse was warning
about instead of our having quieted sparse. :)
--
To unsu
On Mon, Oct 14, 2013 at 6:06 PM, Eric Sunshine wrote:
> On Mon, Oct 14, 2013 at 6:29 PM, Felipe Contreras
> wrote:
>> diff --git a/builtin/stage.c b/builtin/stage.c
>> new file mode 100644
>> index 000..3023d17
>> --- /dev/null
>> +++ b/builtin/stage.c
>> @@ -0,0 +1,52 @@
>> +/*
>> + * 'git s
On Mon, Oct 14, 2013 at 6:29 PM, Felipe Contreras
wrote:
> diff --git a/builtin/stage.c b/builtin/stage.c
> new file mode 100644
> index 000..3023d17
> --- /dev/null
> +++ b/builtin/stage.c
> @@ -0,0 +1,52 @@
> +/*
> + * 'git stage' builtin command
> + *
> + * Copyright (C) 2013 Felipe Contrer
On Mon, Oct 14, 2013 at 5:29 PM, Felipe Contreras
wrote:
> tl;dr: everyone except Junio C Hamano and Drew Northup agrees; we should move
> away from the name "the index".
Junio, can you make an exception and reply to this thread? The change
to move away from the term "the index" has been suggeste
Jeff King writes:
> Yeah, you are right[1]. I'm happy to re-roll. I wonder if we even need
> to worry about a compatibility wrapper. We are already doing pointer
> manipulations, and it is probably just as readable to roll the loop by
> hand.
Yeah, unrolling the loop is probably better. You may
On Mon, Oct 14, 2013 at 06:31:37PM -0400, Jeff King wrote:
> > "git grep" tells me this is the first use of memrchr(), which,
> > unlike memchr(), is _GNU_SOURCE-only if I am not mistaken, so we may
> > need a fallback definition in the compat/ and NEEDS_MEMRCHR in the
> > Makefile, I think.
>
>
Signed-off-by: Felipe Contreras
---
Documentation/git-stage.txt| 5 +++
builtin/stage.c| 75 ++
contrib/completion/git-completion.bash | 4 +-
3 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-sta
--no-stage is synonym for --keep-index.
Signed-off-by: Felipe Contreras
---
Documentation/git-stash.txt | 6 +++---
git-stash.sh| 8 +++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index db7e803..2
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 2b81e78..1dde51f 100644
--- a/contrib/completion/git-com
Signed-off-by: Felipe Contreras
---
Documentation/git-reset.txt | 8
builtin/reset.c | 20
2 files changed, 28 insertions(+)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index f445cb3..5cd75a8 100644
--- a/Documentation/git-res
Signed-off-by: Felipe Contreras
---
Documentation/git-reset.txt | 2 +-
builtin/reset.c | 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 5cd75a8..a1419c9 100644
--- a/Documentation/git-
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
Documentation/git-submodule.txt | 8 ++--
git-submodule.sh| 10 +-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index bfef8a
Signed-off-by: Felipe Contreras
---
Documentation/git-stage.txt| 45 +
Makefile | 2 +-
builtin.h | 1 +
builtin/stage.c| 52 ++
contrib/com
Synonym for --index.
Signed-off-by: Felipe Contreras
---
Documentation/git-apply.txt | 5 -
builtin/apply.c | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index f605327..8c047ef 100644
--- a/Document
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
Documentation/git-diff.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 78d6d50..646e5cd 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/
On Mon, Oct 14, 2013 at 06:40:05PM +, Eric Wong wrote:
> > arnaud.brej...@gmail.com wrote:
> >
> > > Signed-off-by: Arnaud Brejeon gmail.com>
> >
> > Thanks.
> >
> > Can you say a little more about the context? Do you run a script that
> > wants to pass a password to 'git svn', do you typ
tl;dr: everyone except Junio C Hamano and Drew Northup agrees; we should move
away from the name "the index".
It has been discussed many times in the past that 'index' is not an
appropriate description for what the high-level user does with it, and
it has been agreed that 'staging area' is the bes
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
Documentation/git-rm.txt | 5 -
builtin/rm.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 1d876c2..156b40d 100644
--- a/Documentation/git-rm
'git apply', 'git apply --index', 'git apply --cached' do different
things, but what they do is not precisely clear, specially since no
other commands has similar distinctions.
With --no-work (--work being the default), it's clear what the option
would do; modify, or not, the working directory.
S
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
Documentation/git-grep.txt | 5 -
builtin/grep.c | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 8497aa4..9f7899c 100644
--- a/Documentati
Synonym of --index.
Signed-off-by: Felipe Contreras
---
Documentation/git-stash.txt | 8
git-stash.sh| 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 21a01c2..5fdaa35 100644
--- a/Doc
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 1dde51f..082f207 100644
--- a/contrib/completion/git-completion.b
On Mon, Oct 14, 2013 at 03:25:29PM -0700, Junio C Hamano wrote:
> > + /*
> > +* Look from the end-of-line to find the trailing ">" of the mail
> > +* address, even though we should already know it as split->mail_end.
> > +* This can help in cases of broken idents with an extra ">" so
Eric Sunshine wrote:
> On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
> wrote:
> > SYNOPSIS
> >
> > [verse]
> > -'git stage' args...
> > -
> > +'git stage' [options] [--] [...]
> > +'git stage add' [options] [--] [...]
> > +'git stage reset' [-q|--patch] [--] [...]
> > +'git stage d
Jeff King writes:
> You could take this concept further and try to do something clever with
> the email when we notice the extra ">". But I think that is where this
> crosses from "easily and simply covers a class of errors" into "losing
> proposition trying to tweak heuristics around various bre
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Clearly, a lot of my patches have not been reviewed ...
>
> I think the reason for it most likely is because you earned the Bozo
> bit ($gmane/227602) in many reviewers' eyes.
So what you are saying is that the reason is entirely personal,
Krzysztof Mazur wrote:
> On Sat, Oct 12, 2013 at 02:04:45AM -0500, Felipe Contreras wrote:
> > So that we can specify general modes of operation, specifically, add the
> > 'next' mode, which makes Git pre v2.0 behave as Git v2.0.
> >
> > Signed-off-by: Felipe Contreras
> > ---
>
> I don't think
On Mon, Oct 14, 2013 at 05:27:39AM +, Eric Wong wrote:
> Daniel Stenberg wrote:
> > On Sat, 12 Oct 2013, Eric Wong wrote:
> >
> > >This is a follow up to commit
> > >e47a8583a20256851e7fc882233e3bd5bf33dc6e (enable SO_KEEPALIVE for
> > >connected TCP sockets).
> >
> > Just keep in mind that
Jonathan Nieder wrote:
> Stefan Beller wrote:
> > On 10/12/2013 09:07 AM, Felipe Contreras wrote:
>
> >> Signed-off-by: Felipe Contreras
> >
> > Not sure if it's worth by a newcomer. ;)
>
> A second set of eyes is always welcome.
>
> My thoughts: I have to admit I don't see much value in mechan
On Sat, Oct 12, 2013 at 02:04:45AM -0500, Felipe Contreras wrote:
> So that we can specify general modes of operation, specifically, add the
> 'next' mode, which makes Git pre v2.0 behave as Git v2.0.
>
> Signed-off-by: Felipe Contreras
> ---
I don't think that single option it's a good idea. Fr
Split_ident currently parses left to right. Given this
input:
Your Name 123456789 -0500\n
We assume the name starts the line and runs until the first
"<". That starts the email address, which runs until the
first ">". Everything after that is assumed to be the
timestamp.
This works fine in
On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
wrote:
> SYNOPSIS
>
> [verse]
> -'git stage' args...
> -
> +'git stage' [options] [--] [...]
> +'git stage add' [options] [--] [...]
> +'git stage reset' [-q|--patch] [--] [...]
> +'git stage diff' [options] [] [--] [...]
> +'git stage
On Sat, Oct 12, 2013 at 3:05 AM, Felipe Contreras
wrote:
> So that we can covert the exported ref names.
s/covert/convert/ [1]
[1]: http://thread.gmane.org/gmane.comp.version-control.git/225475/focus=225489
> Signed-off-by: Felipe Contreras
--
To unsubscribe from this list: send the line "unsu
On Sun, Oct 13, 2013 at 10:29 PM, Jiang Xin wrote:
> In test cases for relative_path, path with one leading character
> (such as /a, /x) may be recogonized as "a:/" or "x:/" if there is
> such DOS drive on MSYS platform. Use an umambigous leading path
> "/foo" instead.
>
> Also change two leading
On Fri, Oct 11, 2013 at 11:49 PM, Ralf Thielow wrote:
> Since 920b691 (clone: refuse to clone if --branch
> points to bogus ref) we refuse to clone with option
> "-b" if the specified branch does not exist in the
> (non-empty) upstream. If the upstream repository is empty,
> the branch doesn't exi
On Sun, Oct 13, 2013 at 3:48 AM, Yoshioka Tsuneo
wrote:
> "git diff -M --stat" can detect rename and show renamed file name like
> "foofoofoo => barbarbar", but if destination filename is long the line
> is shortened like "...barbarbar" so there is no way to know whether the
> file is renamed or e
What's cooking in git.git (Oct 2013, #01; Mon, 14)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Junio is back (yay!) and is picking maint
Jonathan Nieder wrote:
> Hi,
>
> arnaud.brej...@gmail.com wrote:
>
> > Signed-off-by: Arnaud Brejeon gmail.com>
>
> Thanks.
>
> Can you say a little more about the context? Do you run a script that
> wants to pass a password to 'git svn', do you type it each time on the
> command line, or so
For some reason, I have the theme for Star Wars in my head. :)
On Mon, Oct 14, 2013 at 10:37 AM, Junio C Hamano wrote:
> I am physically back to work, but I'll have to coordinate the
> hand-off of topic branches updated during my absence with Jonathan
> before resuming to update my git.git reposi
Felipe Contreras writes:
> Clearly, a lot of my patches have not been reviewed ...
I think the reason for it most likely is because you earned the Bozo
bit ($gmane/227602) in many reviewers' eyes.
I phrased it differently ($gmane/233347) at the beginning of this
cycle, but I'll say it one more
I am physically back to work, but I'll have to coordinate the
hand-off of topic branches updated during my absence with Jonathan
before resuming to update my git.git repository at kernel.org and
elsewhere.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
On Mon, 14 Oct 2013, Jonathan Nieder wrote:
> Nicolas Vigier wrote:
>
> > The description of the user.signingkey option only mentioned its use
> > when creating a signed tag. Make it clear that is is also used when
> > creating signed commits.
> > ---
> > Documentation/config.txt | 10 +-
Nicolas Vigier wrote:
> The description of the user.signingkey option only mentioned its use
> when creating a signed tag. Make it clear that is is also used when
> creating signed commits.
> ---
> Documentation/config.txt | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
Thanks
The description of the user.signingkey option only mentioned its use
when creating a signed tag. Make it clear that is is also used when
creating signed commits.
---
Documentation/config.txt | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/config.txt b/D
On Mon, 14 Oct 2013, Jonathan Nieder wrote:
> Nicolas Vigier wrote:
>
> > "the option is optional" was confusing as it is not the option but its
> > argument which is optional.
> >
> > Signed-off-by: Nicolas Vigier
>
> Thanks.
>
> [...]
> > --- a/Documentation/git-rev-parse.txt
> > +++ b/Docum
Nicolas Vigier wrote:
> "the option is optional" was confusing as it is not the option but its
> argument which is optional.
>
> Signed-off-by: Nicolas Vigier
Thanks.
[...]
> --- a/Documentation/git-rev-parse.txt
> +++ b/Documentation/git-rev-parse.txt
> @@ -259,9 +259,10 @@ Each line of option
"the option is optional" was confusing as it is not the option but its
argument which is optional.
Signed-off-by: Nicolas Vigier
---
Documentation/git-rev-parse.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-pa
Stefan Beller wrote:
> On 10/12/2013 09:07 AM, Felipe Contreras wrote:
>> Signed-off-by: Felipe Contreras
>
> Not sure if it's worth by a newcomer. ;)
A second set of eyes is always welcome.
My thoughts: I have to admit I don't see much value in mechanical
replacements like this one when done p
Hi,
arnaud.brej...@gmail.com wrote:
> Signed-off-by: Arnaud Brejeon gmail.com>
Thanks.
Can you say a little more about the context? Do you run a script that
wants to pass a password to 'git svn', do you type it each time on the
command line, or something else? Is it ok that the password woul
Jonathan Nieder writes:
> Matthieu Moy wrote:
>> Jens Lehmann writes:
>
>>> static struct lock_file lock_file;
>>> +#define SUBMODULE_WITH_GITDIR ((const char *)1)
>>
>> I don't like very much hardcoded addresses like this. Are you 100% sure
>> address 1 will never be returned by xstrdup on any
Hello everyone,
Recently we have migrated from Subversion to Git in a multiplatform,
though mostly Windows oriented working environment. During the course of
this migration we ran into newline issues between people using Mac and
Windows. When investigating the issue we noticed that the migration
p
Do you need a legit loan lender?? if yes apply
--
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
71 matches
Mail list logo
