> I feel like I'm splitting hairs, but I think there's a change in
> meaning if you use that phrasing. The difference being "not expecting"
> vs. "should not". I don't know which is correct, so I'll defer that to
> someone else.
Okay, changed to
+ * This shouldn't be be set by the Makefile or by
On 03/28/2014 11:21 PM, Junio C Hamano wrote:
> 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,
Have you overlooked my ref-transactions series [1], or just not gotten
to it yet?
I
Junio C Hamano writes:
>> @@ -99,6 +116,18 @@ static int get_one_patchid(unsigned char *next_sha1,
>> git_SHA_CTX *ctx, struct st
>> if (!memcmp(line, "@@ -", 4)) {
>> /* Parse next hunk, but ignore line numbers. */
>>
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
More topics merged to 'master', many of which are fallouts from GSoC
microprojects.
You can find the changes described here in the integration
"Michael S. Tsirkin" writes:
> +static void flush_one_hunk(unsigned char *result, git_SHA_CTX *ctx)
> {
> - int patchlen = 0, found_next = 0;
> + unsigned char hash[20];
> + unsigned short carry = 0;
> + int i;
> +
> + git_SHA1_Final(hash, ctx);
> + git_SHA1_Init(ctx);
>
Marat Radchenko writes:
> By default, Windows abort()'s instead of setting
> errno=EINVAL when invalid arguments are passed to standard functions.
>
> For example, when PAGER quits and git detects it with
> errno=EPIPE on write(), check_pipe() in write_or_die.c tries raise(SIGPIPE)
> but since th
By default, Windows abort()'s instead of setting
errno=EINVAL when invalid arguments are passed to standard functions.
For example, when PAGER quits and git detects it with
errno=EPIPE on write(), check_pipe() in write_or_die.c tries raise(SIGPIPE)
but since there is no SIGPIPE on Windows, it is t
On Fri, Mar 28, 2014 at 03:43:29PM -0400, Eric Sunshine wrote:
> On Fri, Mar 28, 2014 at 3:01 PM, Jeff King wrote:
> > On Fri, Mar 28, 2014 at 11:09:14AM -, Gerhard Grimm wrote:
> >> git submodule init
> >>
> >> fails with the output
> >>
> >> Assertion failed: err == REG_ESPACE, file com
On Fri, Mar 28, 2014 at 3:01 PM, Jeff King wrote:
> On Fri, Mar 28, 2014 at 11:09:14AM -, Gerhard Grimm wrote:
>> git submodule init
>>
>> fails with the output
>>
>> Assertion failed: err == REG_ESPACE, file compat/regex/regexec.c, line
>> 1096
>> No submodule mapping found in .gitmo
Jeff King writes:
> This (non-)issue has consumed a lot more brain power than it is probably
> worth. I'd like to figure out which patch to go with and be done. :)
Let's just deal with a simple known cases (like FreeBSD) in the real
code that everybody exercises at runtime, and have the new test
Johannes Sixt writes:
>> My reading of git-send-email is:
>>
>> * "$time = time - scalar $#files" prepares the initial "timestamp",
>>so that running two "git send-email" back to back will give
>>timestamps to the series sent out by the first invocation that
>>are older than the one
"Michael S. Tsirkin" writes:
> Patch id changes if you reorder hunks in a diff.
> As the result is functionally equivalent, this is surprising to many
> people.
> In particular, reordering hunks is helpful to make patches
> more readable (e.g. API header diff before implementation diff).
> In git
On 28 March 2014 21:47, Junio C Hamano wrote:
>
>
>Teach gitweb to show GPG signature verification status when
>showing a commit that is signed. Highlight in green or red to
>differentiate valid and invalid signatures.
>
> or something?
Yes, kind of :)
> Is it a good idea to do t
Am 28.03.2014 19:36, schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> Am 28.03.2014 18:06, schrieb Junio C Hamano:
>>> Johannes Sixt writes:
>>>
Am 3/27/2014 19:48, schrieb Junio C Hamano:
>> From: Kirill Smelkov
>> Date: Mon, 24 Feb 2014 20:21:46 +0400
>> ...
>
> B
Junio C Hamano writes:
> Marat Radchenko writes:
>
>> This patch fixes crashes caused by quitting from PAGER.
>
> Can you elaborate a bit more on the underlying cause, summarizing
> what you learned from this discussion, so that those who read "git
> log" output two weeks from now do not have to
On Fri, Mar 28, 2014 at 12:02:46PM -0700, Junio C Hamano wrote:
> >> - teach the "is the result sane, even though we may have got a
> >>non-NULL from gmtime? otherwise let's signal a failure by
> >>replacing it with a known sentinel value" codepath the new
> >>failure mode Charles's
Jeff King writes:
> On Fri, Mar 28, 2014 at 09:41:53AM -0700, Junio C Hamano wrote:
>
>> Offhand, the three possible failure modes this thread identified
>> sounds to me like the only plausible ones, and I think the best way
>> forward might be to
>>
>> - teach the "is the result sane, even tho
On Fri, Mar 28, 2014 at 11:09:14AM -, Gerhard Grimm wrote:
> So I examined the git source package and found that the author of the
> HP-UX port forgot to set
>
> PTHREAD_CFLAGS=-mt
>
> in config.mak.autogen to enable threading.
You probably want to place such manual settings in config.mak.
On Fri, Mar 28, 2014 at 10:12:15AM -0700, Junio C Hamano wrote:
> By the way, that is "rfc2822"---do we want "rfc822" as its synonym
> as well as "rfc", I wonder ;-)
Oops, I wrote that as I was literally looking at the code that said
rfc2822 and didn't notice. On the other hand, I have never made
Junio C Hamano pobox.com> writes:
> > This patch fixes crashes caused by quitting from PAGER.
>
> Can you elaborate a bit more on the underlying cause, summarizing
> what you learned from this discussion, so that those who read "git
> log" output two weeks from now do not have to come back to th
On Fri, Mar 28, 2014 at 09:41:53AM -0700, Junio C Hamano wrote:
> Offhand, the three possible failure modes this thread identified
> sounds to me like the only plausible ones, and I think the best way
> forward might be to
>
> - teach the "is the result sane, even though we may have got a
>n
Johannes Sixt writes:
> Am 28.03.2014 18:06, schrieb Junio C Hamano:
>> Johannes Sixt writes:
>>
>>> Am 3/27/2014 19:48, schrieb Junio C Hamano:
> From: Kirill Smelkov
> Date: Mon, 24 Feb 2014 20:21:46 +0400
> ...
By the way, in general I do not appreciate people lying on
Marat Radchenko writes:
> This patch fixes crashes caused by quitting from PAGER.
Can you elaborate a bit more on the underlying cause, summarizing
what you learned from this discussion, so that those who read "git
log" output two weeks from now do not have to come back to this
thread in the mai
"Michael S. Tsirkin" writes:
> Patch id changes if you reorder hunks in a diff.
Reording "files" is fine, and as we discussed, having multiple
patches that touch the same path is fine, but do not sound as if you
are allowing to reorder "hunks" inside a single patch that touch a
single file.
Tha
Marat Radchenko writes:
> Signed-off-by: Marat Radchenko
> ---
> test-parse-options.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/test-parse-options.c b/test-parse-options.c
> index 434e8b8..7840493 100644
> --- a/test-parse-options.c
> +++ b/test-parse-options.c
Jens Lehmann writes:
>> .. but it's less clear if one explicitely stages an updated
>> submodule using git add. Git commit will ignore it anyway, if
>> ignore=all is configured in .gitmodules. Maybe that's correct too
That definitely smells like a bug to me. Excluding modified
submodules when "
Victor Kartashov writes:
> show gpg signature (if any) for commit message in gitweb
> in case of valid signature highlight it with green
> in case of invalid signature highlight it with red
If that is a single sentence, please write it as such:
Show gpg signature (if any) for commit message
Am 28.03.2014 18:06, schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> Am 3/27/2014 19:48, schrieb Junio C Hamano:
From: Kirill Smelkov
Date: Mon, 24 Feb 2014 20:21:46 +0400
...
>>>
>>> By the way, in general I do not appreciate people lying on the Date:
>>> with an in-body hea
Duy Nguyen writes:
> I'd rather go with no trailing slash by default and add -F (which
> seems to be more than just '/')
... and then add a configuration variable to let users enable it by
default.
For GNU ls, I have "alias ls='ls -F --color=auto'" in my shell's
configuration, but I cannot push
On Mar 26, 2014, at 1:29 PM, Junio C Hamano wrote:
> Andrew Keller writes:
>
>> On Mar 25, 2014, at 6:17 PM, Junio C Hamano wrote:
>> ...
I think that the standard practice with the existing toolset is to
clone with reference and then repack. That is:
$ git clone --refe
On Fri, Mar 28, 2014 at 8:52 PM, Matthieu Moy
wrote:
> Duy Nguyen writes:
>
>> I'd rather go with no trailing slash by default and add -F (which
>> seems to be more than just '/')
>
> ... and then add a configuration variable to let users enable it by
> default.
>
> For GNU ls, I have "alias ls='
On Fri, Mar 28, 2014 at 9:15 PM, Duy Nguyen wrote:
> On Fri, Mar 28, 2014 at 8:52 PM, Matthieu Moy
> wrote:
>> Duy Nguyen writes:
>>
>>> I'd rather go with no trailing slash by default and add -F (which
>>> seems to be more than just '/')
>>
>> ... and then add a configuration variable to let us
Junio C Hamano writes:
> Ilya Bobyr writes:
>
>> If there is decision on how shortening should work for all the
>> options, maybe I could add a paragraph on that and make existing
>> options more consistent.
>
> We should strive to make the following from gitcli.txt apply
> throughout the system
Jens Lehmann writes:
> Am 28.03.2014 04:58, schrieb W. Trevor King:
>> On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote:
>>> On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote:
On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote:
> submodule..branch::
>
Jeff King writes:
> On Thu, Mar 27, 2014 at 10:37:07AM -0300, Thiago Farina wrote:
>
>> Do we leak the context we allocate in imap-send.c:280 intentionally?
>
> It was never mentioned on the mailing list when the patches came
> originally, so I suspect is just an omission.
>
> Presumably the SSL_
Jeff King writes:
> But I also do not overly care. Literally zero people have complained
> that "[log]date = RFC822" is not accepted, so it is probably not a big
> deal either way.
That is most likely because we do not advertise these enum values
spelled in random cases in our documentation and
On Fri, Mar 28, 2014 at 05:57:50PM +0100, Jens Lehmann wrote:
> Am 28.03.2014 04:58, schrieb W. Trevor King:
> > On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote:
> >> No the remote branch is in the upstream subproject. I suppose I meant
> >> “the submodule's remote-tracking branch f
Johannes Sixt writes:
> Am 3/27/2014 19:48, schrieb Junio C Hamano:
>>> From: Kirill Smelkov
>>> Date: Mon, 24 Feb 2014 20:21:46 +0400
>>> ...
>>
>> By the way, in general I do not appreciate people lying on the Date:
>> with an in-body header in their patches, either in the original or
>> in r
Andrew Keller writes:
> Okay, so to re-frame my idea, like you said, the goal is to find a user-
> friendly way for the user to tell git-clone to set up the alternates file
> (or perhaps just use the --alternates parameter), and run a repack,
> and disconnect the alternate. And yet, we still wan
On Fri, Mar 28, 2014 at 05:55:18PM +0100, Jens Lehmann wrote:
> I just noticed that the two patches Junio added to pu have a
> reworded commit message I'm perfectly happy with.
The revised wording works for me too.
Cheers,
Trevor
--
This email may be signed or encrypted with GnuPG (http://www.g
Am 28.03.2014 04:58, schrieb W. Trevor King:
> On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote:
>> On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote:
>>> On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote:
submodule..branch::
A remote branch name f
I just noticed that the two patches Junio added to pu have a reworded
commit message I'm perfectly happy with.
Thanks all.
Am 28.03.2014 03:06, schrieb W. Trevor King:
> On Fri, Mar 28, 2014 at 12:15:00AM +0100, Jens Lehmann wrote:
>> Am 27.03.2014 22:06, schrieb W. Trevor King:
>>> The transitio
Am 28.03.2014 00:36, schrieb Ronald Weiss:
> Hello.
>
> As this is my first post to this list, let me first thank all the
> people involved in Git development - it's really a great tool.
Welcome and thanks for the feedback!
> Now to the point. Since Git 1.8 (I think), git commit command honours
Jeff King writes:
>> Sat Jan 25 10:46:39 316889355 -0700
>> 9 Wed Sep 6 02:46:39 -1126091476 -0700
>> 99 Thu Oct 24 18:46:39 1623969404 -0700
>
> Thanks. Given the value where it fails, it kind of looks like there is
> some signed 32-bit value at w
If 'err' is non-zero, lstat() has failed. Consider the entry modified
without passing the (unreliable) stat info to ce_modified() in this
case.
Noticed-by: Eric Sunshine
Signed-off-by: Nguyễn Thái Ngọc Duy
---
On Fri, Mar 28, 2014 at 11:04 AM, Eric Sunshine
wrote:
> On Wed, Mar 26, 2014 at 9
Patch id changes if you reorder hunks in a diff.
As the result is functionally equivalent, this is surprising to many
people.
In particular, reordering hunks is helpful to make patches
more readable (e.g. API header diff before implementation diff).
In git, it is often done e.g. using the "-O " opt
Clarify that patch ID is now a sum of hashes, not a hash.
Document --stable and --unstable flags.
Signed-off-by: Michael S. Tsirkin
---
No change from v1.
Documentation/git-patch-id.txt | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/Documentation/git
Verify that patch ID is now stable against hunk reordering.
Signed-off-by: Michael S. Tsirkin
---
changes from v1:
Use <<-\EOF to address comment by Eric Sunshine
t/t4204-patch-id.sh | 68 +
1 file changed, 63 insertions(+), 5 deletio
Signed-off-by: Marat Radchenko
---
test-parse-options.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test-parse-options.c b/test-parse-options.c
index 434e8b8..7840493 100644
--- a/test-parse-options.c
+++ b/test-parse-options.c
@@ -11,6 +11,7 @@ static char *string = NUL
Gerhard Grimm detec.com> writes:
>
> In order to set up automated builds and tests of the CMake toolchain
(www.cmake.org) on HP-UX 11.11 (hppa)
> and 11.23 (ia64), I needed to install git on those platforms.
> The latest binary package available from hpux.connect.org.uk is version
1.8.5.3, whi
>> +sed -i -e "s/void newfunc2/void newfunc4/" file &&
I forgot to mention that sed -i is not portable.
-- Hannes
--
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-in
This patch fixes crashes caused by quitting from PAGER.
Signed-off-by: Marat Radchenko
---
> Please do not cull the Cc list.
That was gmane web interface.
> The correct solution is to link against invalidcontinue.obj in the MSVC
> build. This is a compiler-provided object file that changes the
In order to set up automated builds and tests of the CMake toolchain
(www.cmake.org) on HP-UX 11.11 (hppa) and 11.23 (ia64), I needed to install git
on those platforms.
The latest binary package available from hpux.connect.org.uk is version
1.8.5.3, which I installed with all of its dependencies
Please do not cull the Cc list.
Am 3/28/2014 11:07, schrieb Marat Radchenko:
> Jeff King peff.net> writes:
>
>>
>> I'm not sure what an actual SIGPIPE death looks like on Windows.
>
> There is no SIGPIPE death on Windows due to total absence of SIGPIPE.
> raise(unsupported int) just causes ugly
On Fri, Mar 28, 2014 at 10:07:22AM +, Marat Radchenko wrote:
> > What
> > happens if git is still writing data to the pager and the pager exits?
> > Does it receive a signal of some sort?
>
> I'm not sure what you mean, sorry. check_pipe properly detects pager exit.
> The problem is with the
Jeff King peff.net> writes:
>
> I'm not sure what an actual SIGPIPE death looks like on Windows.
There is no SIGPIPE death on Windows due to total absence of SIGPIPE.
raise(unsupported int) just causes ugly "git.exe has stopped working"
window and possibly ends up as SIGABT (I don't know how to
From: Vicent Marti
When pack-objects is computing the reachability bitmap to
serve a fetch request, it can erroneously die() if some of
the UNINTERESTING objects are not present. Upload-pack
throws away HAVE lines from the client for objects we do not
have, but we may have a tip object without al
show gpg signature (if any) for commit message in gitweb
in case of valid signature highlight it with green
in case of invalid signature highlight it with red
Signed-off-by: Victor Kartashov
---
here's new patch
fixed remarks by Eric Sunshine
"pop @commit_lines" in parse_commit_text() leads to a
On Fri, Mar 28, 2014 at 09:14:07AM +, Marat Radchenko wrote:
> > Jeff King peff.net> writes:
> >
> > >
> > > The write_or_die function will always die on an error,
> > > including EPIPE. However, it currently treats EPIPE
> > > specially by suppressing any error message, and by exiting
> >
Marat Radchenko slonopotamus.org> writes:
>
> Jeff King peff.net> writes:
>
> >
> > The write_or_die function will always die on an error,
> > including EPIPE. However, it currently treats EPIPE
> > specially by suppressing any error message, and by exiting
> > with exit code 0.
>
> This cau
Jeff King peff.net> writes:
>
> The write_or_die function will always die on an error,
> including EPIPE. However, it currently treats EPIPE
> specially by suppressing any error message, and by exiting
> with exit code 0.
This causes error box on Windows in MSVC=1 build:
git.exe!_invoke_watson
K1tchen Designer Hertfordshire. Thirty Ex Display K1tchens To Clear.
w.w.w-e.x.d.i.s.p.l.a.y.k.i.t.c.h.e.n.s.1-c.o-u.k. .£ 5.9.5. Each with
appliances.
--
View this message in context:
http://git.661346.n2.nabble.com/K1tchen-Designer-Hertfordshire-tp7606921.html
Sent from the git mailing lis
On Fri, Mar 28, 2014 at 3:25 AM, Johannes Sixt wrote:
> Am 3/27/2014 19:50, schrieb David A. Dalrymple (and Bhushan G. Lodha):
>> From: "Bhushan G. Lodha & David A. Dalrymple"
>>
>> This test builds a sample C file, adding and removing functions, and
>> checks that the right commits are filtered
Without this, xdiff/xutils.c fails to compile.
Signed-off-by: Marat Radchenko
---
I thought about removing #define inline __inline from compat/msvc.h but:
* compat/msvc.h is included based on #if defined(_MSC_VER)
and can be enabled even if MSVC != 1
* compat/msvc.h also has #define __inli
Am 3/27/2014 19:50, schrieb David A. Dalrymple (and Bhushan G. Lodha):
> From: "Bhushan G. Lodha & David A. Dalrymple"
>
> This test builds a sample C file, adding and removing functions, and
> checks that the right commits are filtered by --function-name matching.
This is probably the most impo
On 3/27/2014 8:36 PM, Eric Sunshine wrote:
> On Thu, Mar 27, 2014 at 6:32 AM, Ilya Bobyr wrote:
>> Allow better control of the set of tests that will be executed for a
>> single test suite. Mostly useful while debugging or developing as it
>> allows to focus on a specific test.
>>
>> Signed-off-b
From: Jeff King
Subject: Re: [PATCH v8 03/12] Move lower case functions into wrapper.c
Date: Thu, 27 Mar 2014 18:34:06 -0400
> On Thu, Mar 27, 2014 at 03:16:48PM -0700, Junio C Hamano wrote:
>
>> > I wasn't looking at the caller (and I haven't). I agree that, if
>> > you have to compare case-in
67 matches
Mail list logo
