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

2014-03-27 Thread Christian Couder
From: Junio C Hamano gits...@pobox.com Christian Couder chrisc...@tuxfamily.org writes: diff --git a/wrapper.c b/wrapper.c index 0cc5636..c46026a 100644 --- a/wrapper.c +++ b/wrapper.c @@ -455,3 +455,17 @@ struct passwd *xgetpwuid_self(void) errno ? strerror(errno) :

Re: [PATCH v8 00/12] Add interpret-trailers builtin

2014-03-27 Thread Christian Couder
From: Junio C Hamano gits...@pobox.com Christian Couder chrisc...@tuxfamily.org writes: Until now git commit has only supported the well known Signed-off-by: trailer, that is used by many projects like the Linux kernel and Git. It is better to implement features for these trailers first

Re: [PATCH v8 01/12] Add data structures and basic functions for commit trailers

2014-03-27 Thread Christian Couder
From: Junio C Hamano gits...@pobox.com Subject: Re: [PATCH v8 01/12] Add data structures and basic functions for commit trailers Date: Wed, 26 Mar 2014 16:06:35 -0700 Christian Couder chrisc...@tuxfamily.org writes: Subject: Re: [PATCH v8 01/12] Add data structures and basic functions for

[PATCH] MSVC: allow enabling CURL

2014-03-27 Thread Marat Radchenko
Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/vcbuild/scripts/clink.pl | 2 ++ config.mak.uname| 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index 4374771..a87d0da 100755

[PATCH] MSVC: added missing include so `make INLINE=__inline` is no longer required

2014-03-27 Thread Marat Radchenko
Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- xdiff/xutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 62cb23d..a21a835 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -23,6 +23,7 @@ #include limits.h #include assert.h #include

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

2014-03-27 Thread Michael S. Tsirkin
Verify that patch ID is now stable against hunk reordering. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4204-patch-id.sh | 68 + 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/t/t4204-patch-id.sh

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

2014-03-27 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 --- Documentation/git-patch-id.txt | 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff --git

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

2014-03-27 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). Change patch-id behaviour making it stable

Re: [PATCH 1/3] test-lib: Document short options in t/README

2014-03-27 Thread Ilya Bobyr
On 3/25/2014 10:23 AM, Junio C Hamano wrote: Ilya Bobyr ilya.bo...@gmail.com writes: On 3/24/2014 4:39 AM, Ramsay Jones wrote: On 24/03/14 08:49, Ilya Bobyr wrote: [...] [...] ---valgrind=tool:: +-v,--valgrind=tool:: The -v short option is taken, above ... :-P Right %) Thanks :)

Re: [RFC/PATCH] Better control of the tests run by a test suite

2014-03-27 Thread Ilya Bobyr
On 3/24/2014 9:58 PM, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Mon, Mar 24, 2014 at 01:49:44AM -0700, Ilya Bobyr wrote: Here are some examples of how functionality added by the patch could be used. In order to run setup tests and then only a specific test (use case 1) one

[RFC/PATCH v2] Better control of the tests run by a test suite

2014-03-27 Thread Ilya Bobyr
This is an update verson of the patches I've posted here: [RFC/PATCH] Better control of the tests run by a test suite http://www.mail-archive.com/git@vger.kernel.org/msg46419.html Chanes are only in the first patch, according to

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

2014-03-27 Thread Ilya Bobyr
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-by: Ilya Bobyr ilya.bo...@gmail.com --- No changes from the previous version. t/README | 65

[PATCH 2/3] test-lib: tests skipped by GIT_SKIP_TESTS say so

2014-03-27 Thread Ilya Bobyr
We used to show (missing ) next to tests skipped because they are specified in GIT_SKIP_TESTS. Use (GIT_SKIP_TESTS) instead. Plus tests that check basic GIT_SKIP_TESTS functions. Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com --- No changes from the previous version. t/t-basic.sh | 63

[PATCH 1/3] test-lib: Document short options in t/README

2014-03-27 Thread Ilya Bobyr
Most arguments that could be provided to a test have short forms. Unless documented, the only way to learn them is to read the code. Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com --- Minor changes according to comments in http://www.mail-archive.com/git@vger.kernel.org/msg46423.html

Hello.

2014-03-27 Thread Liliane Bettencourt
Greetings, I, Liliane send you this email. You can read about me on: fr.wikipedia.org/wiki/Liliane_Bettencourt I write to you because I intend to give to you some portion of my Bank net-worth which I have been putting away for a long time. I want to cede it to you for charity purpose. If

SSL_CTX leak?

2014-03-27 Thread Thiago Farina
Hi, Do we leak the context we allocate in imap-send.c:280 intentionally? Regards, -- Thiago Farina -- 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

Re: [PATCH 17/19] Portable alloca for Git

2014-03-27 Thread Kirill Smelkov
On Mon, Mar 24, 2014 at 02:47:24PM -0700, Junio C Hamano wrote: Kirill Smelkov k...@mns.spb.ru writes: On Fri, Feb 28, 2014 at 06:19:58PM +0100, Erik Faye-Lund wrote: On Fri, Feb 28, 2014 at 6:00 PM, Kirill Smelkov k...@mns.spb.ru wrote: ... In fact that would be maybe preferred, for

Re: [PATCH/RFC 0/6] reuse deltas found by bitmaps

2014-03-27 Thread Siddharth Agarwal
On 03/26/2014 03:40 PM, Siddharth Agarwal wrote: On 03/26/2014 12:22 AM, Jeff King wrote: [tl;dr the patch is the same as before, but there is a script to measure its effects; please try it out on your repos] Here are the numbers from another, much larger repo: Test

Re: [PATCH v2 18/19] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

2014-03-27 Thread Kirill Smelkov
On Mon, Feb 24, 2014 at 08:21:50PM +0400, Kirill Smelkov wrote: [...] not changed: - low-level helpers are still named with __ prefix as, imho, that is the best convention to name such helpers, without sacrificing signal/noise ratio. All of them are now static though. Please find

Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Johan Herland
Hi, I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: git clone git://gitorious.org/qt/qt5.git qt5 cd qt5 git submodule init qtbase git submodule update In

Re: [PATCH v2 16/19] tree-diff: reuse base str(buf) memory on sub-tree recursion

2014-03-27 Thread Kirill Smelkov
On Tue, Mar 25, 2014 at 01:23:20PM +0400, Kirill Smelkov wrote: On Mon, Mar 24, 2014 at 02:43:36PM -0700, Junio C Hamano wrote: Kirill Smelkov k...@mns.spb.ru writes: instead of allocating it all the time for every subtree in __diff_tree_sha1, let's allocate it once in diff_tree_sha1,

Re: [PATCH 15/19] tree-diff: no need to call full diff_tree_sha1 from show_path()

2014-03-27 Thread Kirill Smelkov
On Mon, Feb 24, 2014 at 08:21:47PM +0400, Kirill Smelkov wrote: As described in previous commit, when recursing into sub-trees, we can use lower-level tree walker, since its interface is now sha1 based. The change is ok, because diff_tree_sha1() only invokes __diff_tree_sha1(), and also, if

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

2014-03-27 Thread Duy Nguyen
On Tue, Mar 25, 2014 at 6:15 PM, Duy Nguyen pclo...@gmail.com wrote: On Tue, Mar 25, 2014 at 3:55 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: - Original Message - The use case in mind is --max-depth=0 to stop recursion. With this we can do git config --global alias.ls

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

2014-03-27 Thread Kirill Smelkov
On Wed, Mar 26, 2014 at 02:34:24PM -0700, Junio C Hamano wrote: Kirill Smelkov k...@navytux.spb.ru writes: On Tue, Mar 25, 2014 at 10:46:32AM -0700, Junio C Hamano wrote: Kirill Smelkov k...@navytux.spb.ru writes: What are the downsides of __ prefix by the way? Aren't these names

Bug report: Git 1.8 on Ubuntu 13.10 refs not valid

2014-03-27 Thread Siggi
Hi, I'm running: Ubuntu 13.10 64 bit and git version git:amd64/saucy 1:1.8.3.2-1 uptodate my remote repository is on a Chiliprojekt server (a fork of Redmine). cloning the repo over http results in following error: sneher@sneher-XPS:~/Dokumente/test$ git clone

[PATCH] gitweb: gpg signature status indication for commits

2014-03-27 Thread Victor Kartashov
shows gpg signature (if any) for commit message in gitweb in case of successfully verifying the signature highlights it with green Signed-off-by: Victor Kartashov victor.kartas...@gmail.com --- gitweb/gitweb.perl | 33 ++--- gitweb/static/gitweb.css | 5 +

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: The docs say [1]: A remote branch name for tracking

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 08:52:08AM -0700, W. Trevor King wrote: Working around that to default to the upstream submodule's HEAD is possible (you can just use --branch HEAD) Actually, this is probably not a good idea. The initial submodule addition works: $ git submodule add -b HEAD

Git feature request: Option to force Git to abort a checkout if working directory is dirty (i.e. disregarding the check for conflicts)

2014-03-27 Thread Jonas Bang
Hi Git developers, This is my first Git feature request, I hope it won’t get me hanged on the gallows ;o) *Git feature request:* Add an option to Git config to configure the criteria for when a git checkout should abort. *Name proposal and options:* checkout.clean false default

Re: [PATCH 1/3] test-lib: Document short options in t/README

2014-03-27 Thread Junio C Hamano
Ilya Bobyr ilya.bo...@gmail.com 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: * many

Re: [PATCH/RFC 0/6] reuse deltas found by bitmaps

2014-03-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: But for a small fetch... 5311.3: server (1 days)0.20(0.17+0.03) 4.39(4.03+6.59) +2095.0% 5311.4: size (1 days) 57.2K 59.5K +4.1% 5311.5: client (1 days)0.08(0.08+0.00) 0.08(0.08+0.00) +0.0% Nice ;-) So this

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

2014-03-27 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: Yeah, but it seems a bit wasteful to allocate memory for a new string, then downcase it, then compare it with strcmp() and then free it, instead of just using strcasecmp() on the original string. I wasn't looking at the caller (and I haven't).

Re: [PATCH] MSVC: added missing include so `make INLINE=__inline` is no longer required

2014-03-27 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org writes: Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- xdiff/xutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 62cb23d..a21a835 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -23,6

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

2014-03-27 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Patch id changes if you reorder hunks in a diff. If you reorder hunks, the patch should no longer apply [*1*], so a feature to make patch-id stable across such move would have no practical use ;-), but I am guessing you meant something else. Perhaps

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: git clone git://gitorious.org/qt/qt5.git qt5 cd qt5 git submodule

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 16:52, schrieb W. Trevor King: On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: The docs

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: git clone

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

2014-03-27 Thread Michael S. Tsirkin
On Thu, Mar 27, 2014 at 09:58:41AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Patch id changes if you reorder hunks in a diff. If you reorder hunks, the patch should no longer apply [*1*], so a feature to make patch-id stable across such move would have no

Re: [PATCH] MSVC: added missing include so `makeINLINE=__inline` is no longer required

2014-03-27 Thread Marat Radchenko
Junio C Hamano gitster at pobox.com writes: My gut feeling is that adding a mechanism to add -DINLINE=__inline only on MSVC to the top-level Makefile, without touching this file, may be a much more palatable. Okay, I'll think more about this one. Maybe *moving* inline=__inline from

Re: Git feature request: Option to force Git to abort a checkout if working directory is dirty (i.e. disregarding the check for conflicts)

2014-03-27 Thread Junio C Hamano
Jonas Bang em...@jonasbang.dk writes: Hi Git developers, This is my first Git feature request, I hope it won’t get me hanged on the gallows ;o) *Git feature request:* Add an option to Git config to configure the criteria for when a git checkout should abort. *Name proposal and

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

2014-03-27 Thread Michael S. Tsirkin
On Thu, Mar 27, 2014 at 09:58:41AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Patch id changes if you reorder hunks in a diff. If you reorder hunks, the patch should no longer apply [*1*], so a feature to make patch-id stable across such move would have no

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

2014-03-27 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: I started to remove that code, but then I recalled why I did it like this. There is a good reason. Yes, you can't simply reorder hunks just like this. But you can get the same effect by prefixing the header: Yes, that is one of the things I

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 27.03.2014 16:52, schrieb W. Trevor King: On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules

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

2014-03-27 Thread Michael S. Tsirkin
On Thu, Mar 27, 2014 at 11:03:46AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: I started to remove that code, but then I recalled why I did it like this. There is a good reason. Yes, you can't simply reorder hunks just like this. But you can get the same

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

2014-03-27 Thread Michael S. Tsirkin
On Thu, Mar 27, 2014 at 08:39:17PM +0200, Michael S. Tsirkin wrote: On Thu, Mar 27, 2014 at 11:03:46AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: I started to remove that code, but then I recalled why I did it like this. There is a good reason. Yes, you

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

2014-03-27 Thread Junio C Hamano
Kirill Smelkov k...@navytux.spb.ru writes: (please keep author email) 8 From: Kirill Smelkov k...@mns.spb.ru Date: Mon, 24 Feb 2014 20:21:46 +0400 Subject: [PATCH v3a] tree-diff: rework diff_tree interface to be sha1 based git am -c will discard everything above the scissors and

Re: Bug report: Git 1.8 on Ubuntu 13.10 refs not valid

2014-03-27 Thread Jeff King
On Thu, Mar 27, 2014 at 03:45:34PM +0100, Siggi wrote: and git version git:amd64/saucy 1:1.8.3.2-1 uptodate my remote repository is on a Chiliprojekt server (a fork of Redmine). cloning the repo over http results in following error: sneher@sneher-XPS:~/Dokumente/test$ git clone

[PATCH 00/10] [RFC] pickaxe for function names

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
This series introduces a --function-name=pattern option for git-log, intended to search for commits which touch a function matching a certain pattern (a feature we've seen requested and are interested in using ourselves). This is our first attempt to patch git; we've tried to observe and follow

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

2014-03-27 Thread 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. Signed-off-by: David Dalrymple (on zayin) davi...@alum.mit.edu --- t/t4213-log-function-name.sh

[PATCH 05/10] diffcore-pickaxe.c: set up funcname pattern

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu We use userdiff_funcname to make the filetype-dependent function name pattern available to pickaxe functions. Signed-off-by: David Dalrymple (on zayin) davi...@alum.mit.edu --- diffcore-pickaxe.c | 9 + 1 file changed, 9

[PATCH 06/10] log: --function-name pickaxe

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu This is similar to the pickaxe grep option (-G), but applies the provided regex only to diff hunk headers, thereby showing only those commits which affect a function with a definition line matching the pattern. These are functions in the

[PATCH 04/10] diff.c/diff.h: expose userdiff_funcname

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu The functionality of userdiff_funcname (determining the language in use for a given file and setting up patterns to match function names in that language) is useful outside of diff.c, so here we remove its static specifier and declare it

[PATCH 02/10] diffcore-pickaxe.c: refactor regex compilation

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu In this file, two functions use identical blocks of code to call the POSIX regex compiling function and handle a possible error. Here we factor that block into its own function, in anticipation of using the same code a third time.

[PATCH 03/10] diffcore-pickaxe.c: Refactor pickaxe_fn signature

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu This function type previously accepted separate regex_t and kwset_t parameters, which conceptually go together. Here we create a struct to encapsulate them, in anticipation of adding a third field that pickaxe_fn's may require. This

[PATCH 10/10] Documentation: Document --function-name usage

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan Lodha David A. Dalrymple dad-...@mit.edu Signed-off-by: David Dalrymple (on zayin) davi...@alum.mit.edu --- Documentation/diff-options.txt | 9 + Documentation/gitdiffcore.txt | 17 ++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git

[PATCH 01/10] .gitattributes: specify the language used

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu Since git can intelligently emit diff hunk headers based on the programming language of each file, assuming that the language is specified in .gitattributes, it makes sense to specify our own language (cpp) in our own .gitattributes file.

[PATCH 07/10] xdiff: add XDL_EMIT_MOREFUNCNAMES

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu For filtering commits by function name, it's useful to identify the function name in cases such as adding a new function to a file (where the default functionality will not emit a function name in the hunk header, because it isn't part of

[PATCH 08/10] xdiff: add XDL_EMIT_MOREHUNKHEADS

2014-03-27 Thread David A. Dalrymple (and Bhushan G. Lodha)
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu For filtering by function names, it's useful to split hunks whenever a function line is encountered, so that each function name being deleted or inserted gets its own hunk header (which then can be easily detected by the filter). This

Re: [git] Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules

Re: [PATCH 00/10] [RFC] pickaxe for function names

2014-03-27 Thread Jeff King
On Thu, Mar 27, 2014 at 02:50:46PM -0400, David A. Dalrymple (and Bhushan G. Lodha) wrote: This series introduces a --function-name=pattern option for git-log, intended to search for commits which touch a function matching a certain pattern (a feature we've seen requested and are interested

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule

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

2014-03-27 Thread Kirill Smelkov
+stefanbeller On Thu, Mar 27, 2014 at 11:48:11AM -0700, Junio C Hamano wrote: Kirill Smelkov k...@navytux.spb.ru writes: (please keep author email) 8 From: Kirill Smelkov k...@mns.spb.ru Date: Mon, 24 Feb 2014 20:21:46 +0400 Subject: [PATCH v3a] tree-diff: rework diff_tree

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

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 10:56 AM, Victor Kartashov victor.kartas...@gmail.com wrote: shows gpg signature (if any) for commit message in gitweb in case of successfully verifying the signature highlights it with green Write in imperative mood: Show gpg ... highlight it... As a corollary, would

Re: Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Heiko Voigt
On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to

submodule.path.branch vs. submodule.name.branch (was: Possible regression in master? (submodules without a master branch).

2014-03-27 Thread W. Trevor King
I'm breaking this off into a sub-thread, so it doesn't distract from the main issue. On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: There is this bit for update in git-submodule.txt: For updates that clone missing submodules, checkout-mode updates will create submodules

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

2014-03-27 Thread W. Trevor King
The transition from submodule.path.* to submodule.name.* happened in 73b0898d (Teach git submodule add the --name option, 2012-09-30), which landed in v1.8.1-rc0 on 2012-12-03. The first submodule.path.branch reference landed a short time later in b9289227 (submodule add: If --branch is given,

Re: submodule.path.branch vs. submodule.name.branch

2014-03-27 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: [side note] Isn't that a typo of submodule.name.branch? Good catch. The transition from submodule.path.* to submodule.name.* happened in 73b0898d (Teach git submodule add the --name option, 2012-09-30), which landed in v1.8.1-rc0 on 2012-12-03.

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

2014-03-27 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Christian Couder chrisc...@tuxfamily.org writes: Yeah, but it seems a bit wasteful to allocate memory for a new string, then downcase it, then compare it with strcmp() and then free it, instead of just using strcasecmp() on the original string. I

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

2014-03-27 Thread Jeff King
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-insensitive user input against known set of tokens, using strcasecmp() would be saner than making a downcased copy and the set of

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

2014-03-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: All bool config values allow tRuE. I was expecting somebody will bring it up, but think about it. Bool is a very special case. Even among CS folks, depending on your background, true may be True may be TRUE may be 1. Conflating it with some random enum does

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

2014-03-27 Thread Jeff King
On Wed, Mar 26, 2014 at 10:46:16PM +, Charles Bailey wrote: On Wed, Mar 26, 2014 at 05:57:41PM -0400, Jeff King wrote: Hmm, so the year you got is actually: 1623969404. That still seems off to me by a factor 20. I don't know if this is really worth digging into that much further, but I

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 19:30, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: Am 27.03.2014 16:52, schrieb W. Trevor King: On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule

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

2014-03-27 Thread Jeff King
On Thu, Mar 27, 2014 at 03:47:01PM -0700, Junio C Hamano wrote: Actually, I think it ends up being hostile to the users to accept random cases without a good reason. If you see two trailer elements whose where are specified as after and AFTER in somebody's configuration file, wouldn't that

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 21:27, schrieb Heiko Voigt: On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes:

Re: [PATCH] git-prompt.sh: make '+' work for unborn branches

2014-03-27 Thread Jeff King
On Thu, Mar 06, 2014 at 10:16:47PM +0100, Maurice Bos wrote: I have no clue why git diff --cached isn't used instead of git diff-index. I was wondering about it, but I decided I don't know enough about git and there are probably valid reasons for doing it this way. Though, replacing it with

Re: SSL_CTX leak?

2014-03-27 Thread Jeff King
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_CTX is needed by the connection

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

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 22:06, schrieb W. Trevor King: The transition from submodule.path.* to submodule.name.* happened in 73b0898d (Teach git submodule add the --name option, 2012-09-30), which landed in v1.8.1-rc0 on 2012-12-03. Nope, the distinction between path and name is way older (AFAIK it is

Re: Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Johan Herland
(Thanks to all of you for picking this up and more or less resolving it while I was away from email for a few hours...) On Thu, Mar 27, 2014 at 9:27 PM, Heiko Voigt hvo...@hvoigt.net wrote: On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes:

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Johan Herland
On Thu, Mar 27, 2014 at 11:55 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 27.03.2014 19:30, schrieb Junio C Hamano: - For a repository that does not have that branch thing configured, the doc says that it will default to 'master'. I do not think this was brought up during the

git commit vs. ignore-submodules

2014-03-27 Thread 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. Now to the point. Since Git 1.8 (I think), git commit command honours the submodules' ignore settings, configured either in .gitmodules, or in .git/config.

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

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 5:25 AM, Michael S. Tsirkin m...@redhat.com wrote: Verify that patch ID is now stable against hunk reordering. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4204-patch-id.sh | 68 + 1 file changed, 63

Re: [PATCH 10/10] Documentation: Document --function-name usage

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 2:50 PM, David A. Dalrymple (and Bhushan G. Lodha) dad-...@mit.edu wrote: From: Bhushan Lodha David A. Dalrymple dad-...@mit.edu Signed-off-by: David Dalrymple (on zayin) davi...@alum.mit.edu --- Documentation/diff-options.txt | 9 +

Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code.

2014-03-27 Thread yun sheng
Hi, I found git sometimes can't detect working trees changes. But I can only reproduce this problem on several specific files, unfortunately these files are copyrighted source files so I can't send them to you. Is there anything I can do to narrow the problem and finally reproduce the bug without

Re: [PATCH v2 06/17] ls-files: add --color to highlight file names

2014-03-27 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 7:15 PM, Duy Nguyen pclo...@gmail.com wrote: On Thu, Mar 27, 2014 at 2:13 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com ---

Re: Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code.

2014-03-27 Thread Trần Ngọc Quân
On 28/03/2014 07:45, yun sheng wrote: Hi, I found git sometimes can't detect working trees changes. But I can only reproduce this problem on several specific files, unfortunately these files are copyrighted source files so I can't send them to you. Is there anything I can do to narrow the

Re: Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code.

2014-03-27 Thread Jonathan Nieder
Hi, yun sheng wrote: these two files have the same timestamp, the same size, bug slightly different contents. How did they get the same timestamp? [...] Git I'm using is msysgit 1.9.0 on windows 7 Unixy operating systems have other fields like inode number and ctime that make it possible

Fwd: Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code.

2014-03-27 Thread yun sheng
-- Forwarded message -- From: yun sheng uew...@gmail.com Date: Fri, Mar 28, 2014 at 9:28 AM Subject: Re: Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code. To: Trần Ngọc Quân vnwild...@gmail.com The result of sha1sum is different. Following is my

Re: Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code.

2014-03-27 Thread yun sheng
The files get the same timestamp by using `git difftool -d` to view diffs, the diff tool I use id beyond compare 3, this command would generate temp files to feed the compare program, so these files get the same time stamp, I copied them out from the temp folder. I have no idea of the second

Git doesn't notice file has changed (Re: Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code.)

2014-03-27 Thread Jonathan Nieder
(cc-ing msysgit list, where there are more Windows-knowledgeable people) yun sheng wrote: On Fri, Mar 28, 2014 at 9:40 AM, Jonathan Nieder jrnie...@gmail.com wrote: yun sheng wrote: these two files have the same timestamp, the same size, bug slightly different contents. How did they get the

Re: Git doesn't notice file has changed (Re: Found a bug in git 1.9.0 but can't reproduce it without copyrighted source code.)

2014-03-27 Thread yun sheng
The problem is I can't reproduce this bug if create some other files which have the same size and timestamp. It only happens on several files in my project. And it's even more frustrating that I can't send these files to the mailing list since it is a proprietary source file. On Fri, Mar 28, 2014

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

2014-03-27 Thread 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 from submodule.path.* to submodule.name.* happened in 73b0898d (Teach git submodule add the --name option, 2012-09-30), which landed in v1.8.1-rc0 on 2012-12-03.

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 11:55:21PM +0100, Jens Lehmann wrote: Me thinks that when a superproject doesn't have 'branch' configured and does set 'update' to something other than 'checkout' for a submodule it should better make sure 'master' is a valid branch in there. Everything else sounds like

Re: Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Fri, Mar 28, 2014 at 12:21:23AM +0100, Johan Herland wrote: On Thu, Mar 27, 2014 at 9:27 PM, Heiko Voigt wrote: On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: There is this bit for update in git-submodule.txt: For updates that clone missing submodules, checkout-mode

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

2014-03-27 Thread Eric Sunshine
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. Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com

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

2014-03-27 Thread W. Trevor King
gitmodule(5) mentioned 'master' as the default remote branch, but folks using checkout-style updates are unlikely to care which upstream branch their commit comes from (they only care that the clone fetches that commit). If they haven't set submodule.name.branch, it makes more sense to mirror

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

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wk...@tremily.us wrote: gitmodule(5) mentioned 'master' as the default remote branch, but folks using checkout-style updates are unlikely to care which upstream branch their commit comes from (they only care that the clone fetches that commit).

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

2014-03-27 Thread W. Trevor King
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 name for tracking updates in the upstream submodule. - If the option is not specified, it defaults

Re: [PATCH v2 13/17] ls: add -1 short for --no-column in the spirit of GNU ls

2014-03-27 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Subject: ls: add -1 short for --no-column in the spirit of GNU ls The -1 option is POSIX [1]; not a GNU extension. [1]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html Signed-off-by: Nguyễn Thái

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

2014-03-27 Thread 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 name for tracking updates in the

Re: [PATCH v2 16/17] ls: do not show duplicate cached entries

2014-03-27 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: With the current show_files() ls -tcm will show foo.c M foo.c The first item is redundant. If foo.c is modified, we know it's in the cache. Introduce show_files_compact to do that because ls-files is plumbing

  1   2   >