Re: [PATCH v2 14/19] tree-diff: rework diff_tree interface to be sha1 based

2014-03-28 Thread Johannes Sixt
Am 3/27/2014 19:48, schrieb Junio C Hamano: From: Kirill Smelkov k...@mns.spb.ru 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 rerolls. format-patch is

Re: [PATCH v8 03/12] Move lower case functions into wrapper.c

2014-03-28 Thread Christian Couder
From: Jeff King p...@peff.net 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

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-03-28 Thread Ilya Bobyr
On 3/27/2014 8:36 PM, Eric Sunshine wrote: On Thu, Mar 27, 2014 at 6:32 AM, Ilya Bobyr ilya.bo...@gmail.com 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.

Re: [PATCH 09/10] t4213: test --function-name option

2014-03-28 Thread Johannes Sixt
Am 3/27/2014 19:50, schrieb David A. Dalrymple (and Bhushan G. Lodha): From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu 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

[PATCH v2] MSVC: define INLINE=__inline so simple `make MSVC=1` actually works

2014-03-28 Thread Marat Radchenko
Without this, xdiff/xutils.c fails to compile. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- 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

Re: [PATCH 09/10] t4213: test --function-name option

2014-03-28 Thread Eric Sunshine
On Fri, Mar 28, 2014 at 3:25 AM, Johannes Sixt j.s...@viscovery.net wrote: Am 3/27/2014 19:50, schrieb David A. Dalrymple (and Bhushan G. Lodha): From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu This test builds a sample C file, adding and removing functions, and checks that the

K1tchen Designer Hertfordshire

2014-03-28 Thread singsing
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

[BUG] MSVC: error box when interrupting `gitlog` by quitting less

2014-03-28 Thread Marat Radchenko
Jeff King peff at 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:

Re: [BUG] MSVC: error box when interrupting `gitlog` by quitting less

2014-03-28 Thread Marat Radchenko
Marat Radchenko marat at slonopotamus.org writes: Jeff King peff at 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

Re: [BUG] MSVC: error box when interrupting `gitlog` by quitting less

2014-03-28 Thread Jeff King
On Fri, Mar 28, 2014 at 09:14:07AM +, Marat Radchenko wrote: Jeff King peff at 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

Re: [PATCH] gitweb: gpg signature status indication for commits

2014-03-28 Thread Victor Kartashov
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 victor.kartas...@gmail.com --- here's new patch fixed remarks by Eric Sunshine pop @commit_lines in

[PATCH] add `ignore_missing_links` mode to revwalk

2014-03-28 Thread Jeff King
From: Vicent Marti tan...@gmail.com 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

Re: [BUG] MSVC: error box when interrupting `gitlog` by quitting less

2014-03-28 Thread Marat Radchenko
Jeff King peff at 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

Re: [BUG] MSVC: error box when interrupting `gitlog` by quitting less

2014-03-28 Thread Jeff King
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 way it

Re: [BUG] MSVC: error box when interrupting `gitlog` by quitting less

2014-03-28 Thread Johannes Sixt
Please do not cull the Cc list. Am 3/28/2014 11:07, schrieb Marat Radchenko: Jeff King peff at 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

Problems with git 1.8.5.3 on HP-UX 11.11

2014-03-28 Thread Gerhard Grimm
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

Re: Problems with git 1.8.5.3 on HP-UX 11.11

2014-03-28 Thread Thomas Ackermann
Gerhard Grimm gerhard.grimm at 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

[PATCH] MSVC: fix t0040-parse-options

2014-03-28 Thread Marat Radchenko
Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- 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 @@

[PATCH v2 3/3] patch-id-test: test new --stable and --unstable flags

2014-03-28 Thread Michael S. Tsirkin
Verify that patch ID is now stable against hunk reordering. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- changes from v1: Use -\EOF to address comment by Eric Sunshine t/t4204-patch-id.sh | 68 + 1 file changed, 63

[PATCH v2 2/3] patch-id: document new behaviour

2014-03-28 Thread Michael S. Tsirkin
Clarify that patch ID is now a sum of hashes, not a hash. Document --stable and --unstable flags. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- No change from v1. Documentation/git-patch-id.txt | 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff --git

[PATCH v2 1/3] patch-id: make it stable against hunk reordering

2014-03-28 Thread Michael S. Tsirkin
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

[PATCH] ls-files: do not trust stat info if lstat() fails

2014-03-28 Thread Nguyễn Thái Ngọc Duy
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 sunsh...@sunshineco.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- On Fri, Mar 28, 2014 at 11:04 AM, Eric

Re: [RFC] submodule: change submodule.name.branch default from master to HEAD

2014-03-28 Thread Jens Lehmann
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 wk...@tremily.us wrote: submodule.name.branch:: A remote branch

Re: [PATCH] Documentation/submodule: Fix submodule.name - .path typos

2014-03-28 Thread W. Trevor King
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

Re: Borrowing objects from nearby repositories

2014-03-28 Thread Junio C Hamano
Andrew Keller and...@kellerfarm.com 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

Re: [RFC] submodule: change submodule.name.branch default from master to HEAD

2014-03-28 Thread W. Trevor King
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 following

Re: [PATCH] Documentation/submodule: Fix submodule.name - .path typos

2014-03-28 Thread Jens Lehmann
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 transition

Re: git commit vs. ignore-submodules

2014-03-28 Thread Jens Lehmann
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 the

Re: SSL_CTX leak?

2014-03-28 Thread Junio C Hamano
Jeff King p...@peff.net 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

Re: [PATCH] t4212: handle systems with post-apocalyptic gmtime

2014-03-28 Thread Junio C Hamano
Jeff King p...@peff.net 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

Re: [RFC] submodule: change submodule.name.branch default from master to HEAD

2014-03-28 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de 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 wk...@tremily.us wrote:

Re: [PATCH 7/8] ls-files: support --max-depth

2014-03-28 Thread Duy Nguyen
On Fri, Mar 28, 2014 at 9:15 PM, Duy Nguyen pclo...@gmail.com wrote: On Fri, Mar 28, 2014 at 8:52 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Duy Nguyen pclo...@gmail.com writes: I'd rather go with no trailing slash by default and add -F (which seems to be more than just '/') ...

Re: [PATCH 7/8] ls-files: support --max-depth

2014-03-28 Thread Duy Nguyen
On Fri, Mar 28, 2014 at 8:52 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Duy Nguyen pclo...@gmail.com 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

Re: [PATCH v8 03/12] Move lower case functions into wrapper.c

2014-03-28 Thread Junio C Hamano
Jeff King p...@peff.net 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

Re: [PATCH v2 14/19] tree-diff: rework diff_tree interface to be sha1 based

2014-03-28 Thread Johannes Sixt
Am 28.03.2014 18:06, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: Am 3/27/2014 19:48, schrieb Junio C Hamano: From: Kirill Smelkov k...@mns.spb.ru 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

Re: [PATCH] gitweb: gpg signature status indication for commits

2014-03-28 Thread Junio C Hamano
Victor Kartashov v.kartas...@npo-echelon.ru 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

Re: git commit vs. ignore-submodules

2014-03-28 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de 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

Re: [PATCH] MSVC: fix t0040-parse-options

2014-03-28 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org writes: Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- 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 ---

Re: Borrowing objects from nearby repositories

2014-03-28 Thread Andrew Keller
On Mar 26, 2014, at 1:29 PM, Junio C Hamano gits...@pobox.com wrote: Andrew Keller and...@kellerfarm.com writes: On Mar 25, 2014, at 6:17 PM, Junio C Hamano gits...@pobox.com wrote: ... I think that the standard practice with the existing toolset is to clone with reference and then repack.

Re: [PATCH v2 1/3] patch-id: make it stable against hunk reordering

2014-03-28 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com 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

Re: [PATCH] MSVC: link in invalidcontinue.obj for better POSIX compatibility

2014-03-28 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org 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

Re: [PATCH] t4212: handle systems with post-apocalyptic gmtime

2014-03-28 Thread Jeff King
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

Re: [PATCH v8 03/12] Move lower case functions into wrapper.c

2014-03-28 Thread Jeff King
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 the

Re: Problems with git 1.8.5.3 on HP-UX 11.11

2014-03-28 Thread Jeff King
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. If

Re: [PATCH] t4212: handle systems with post-apocalyptic gmtime

2014-03-28 Thread Junio C Hamano
Jeff King p...@peff.net 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

Re: [PATCH] t4212: handle systems with post-apocalyptic gmtime

2014-03-28 Thread Jeff King
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 report

Re: [PATCH] MSVC: link in invalidcontinue.obj for better POSIX compatibility

2014-03-28 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Marat Radchenko ma...@slonopotamus.org 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

Re: [PATCH v2 14/19] tree-diff: rework diff_tree interface to be sha1 based

2014-03-28 Thread Johannes Sixt
Am 28.03.2014 19:36, schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: Am 28.03.2014 18:06, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: Am 3/27/2014 19:48, schrieb Junio C Hamano: From: Kirill Smelkov k...@mns.spb.ru Date: Mon, 24 Feb 2014 20:21:46 +0400

Re: [PATCH] gitweb: gpg signature status indication for commits

2014-03-28 Thread Victor Kartashov
On 28 March 2014 21:47, Junio C Hamano gits...@pobox.com 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

Re: [PATCH v2 1/3] patch-id: make it stable against hunk reordering

2014-03-28 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com 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).

Re: [PATCH] t4212: handle systems with post-apocalyptic gmtime

2014-03-28 Thread Junio C Hamano
Jeff King p...@peff.net 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

Re: [PATCH v2 14/19] tree-diff: rework diff_tree interface to be sha1 based

2014-03-28 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org 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 ones

Re: Problems with git 1.8.5.3 on HP-UX 11.11

2014-03-28 Thread Eric Sunshine
On Fri, Mar 28, 2014 at 3:01 PM, Jeff King p...@peff.net 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

Re: Problems with git 1.8.5.3 on HP-UX 11.11

2014-03-28 Thread Jeff King
On Fri, Mar 28, 2014 at 03:43:29PM -0400, Eric Sunshine wrote: On Fri, Mar 28, 2014 at 3:01 PM, Jeff King p...@peff.net 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

[PATCH v2] MSVC: link in invalidcontinue.obj for better POSIX compatibility

2014-03-28 Thread Marat Radchenko
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

Re: [PATCH v2] MSVC: link in invalidcontinue.obj for better POSIX compatibility

2014-03-28 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org 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

Re: [PATCH v2 1/3] patch-id: make it stable against hunk reordering

2014-03-28 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com 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); +

What's cooking in git.git (Mar 2014, #07; Fri, 28)

2014-03-28 Thread Junio C Hamano
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

Re: [PATCH v2 1/3] patch-id: make it stable against hunk reordering

2014-03-28 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com 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. */

Re: What's cooking in git.git (Mar 2014, #07; Fri, 28)

2014-03-28 Thread Michael Haggerty
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? If

Re: [PATCH 3/4] Fix misuses of nor in comments

2014-03-28 Thread Justin Lebar
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 the