[PATCH] filter-branch: skip index read/write when possible

2015-11-05 Thread Jeff King
On Thu, Nov 05, 2015 at 07:20:48PM -0500, Jeff King wrote: > Here's a totally untested patch that seems to make a filter-branch like > this on the kernel orders of magnitude faster: Testing shows that it is indeed broken. :) If $filter_subdir is set, it handles the index read itself, but my earl

Re: [PATCH 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Johannes Sixt
Am 05.11.2015 um 23:20 schrieb Stefan Beller: On Thu, Nov 5, 2015 at 12:27 PM, Johannes Sixt wrote: diff --git a/run-command.c b/run-command.c index 51d078c..3e42299 100644 --- a/run-command.c +++ b/run-command.c @@ -977,7 +977,7 @@ static struct parallel_processes *pp_init(int n, for

[PATCH 1/7] contrib/subtree: Clean and refactor test code

2015-11-05 Thread David Greene
From: Techlive Zheng Mostly prepare for the later tests refactoring. This moves some common code to helper functions and generally cleans things up to be more presentable. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/Makefile | 31 --- c

[PATCH 2/7] contrib/subtree: Add test for missing subtree

2015-11-05 Thread David Greene
From: Techlive Zheng Test that a merge from a non-existant subtree fails. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 4 1 file changed, 4 insertions(+) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-s

[PATCH 5/7] contrib/subtree: Add split tests

2015-11-05 Thread David Greene
From: Techlive Zheng Add tests to check various options to split. Check combinations of --prefix, --message, --annotate, --branch and --rejoin. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 17 +++-- 1 file changed, 15 inser

[PATCH 4/7] contrib/subtree: Add merge tests

2015-11-05 Thread David Greene
From: Techlive Zheng Add some tests for various merge operations. Test combinations of merge with --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 13 - 1 file changed, 12 insertions(+), 1 dele

[PATCH 3/7] contrib/subtree: Add tests for subtree add

2015-11-05 Thread David Greene
From: Techlive Zheng Add some tests to check various options to subtree add. These test various combinations of --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 19 +++ 1 file changed, 19 i

[PATCH 6/7] contrib/subtree: Make each test self-contained

2015-11-05 Thread David Greene
From: Techlive Zheng Each test runs a full repository creation and any subtree actions needed to perform the test. Each test starts with a clean slate, making debugging and post-mortem analysis much easier. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7

[no subject]

2015-11-05 Thread David Greene
I'm processing some old patches I have lying around. These clean up git-subtree's test base and refactor the test code so that each test is independent of the others. This greatly aids debugging and post-mortem analysis. I have rebased these old patches on master, ensuring that new tests that ha

[PATCH 7/7] contrib/subtree: Handle '--prefix' argument with a slash appended

2015-11-05 Thread David Greene
From: Techlive Zheng 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh | 2 +- contrib/subtree/t/t7900-subtree.sh | 20 2 files changed, 21

[PATCH] In configure.ac, try -lpthread in $LIBS instead of $CFLAGS to make picky linkers happy

2015-11-05 Thread Rainer M. Canavan
Some linkers, namely the one on IRIX are rather strict concerning the order or arguments for symbol resolution, i.e. no libraries listed before objects or other libraries on the command line are considered for symbol resolution. Therefore, -lpthread can't work if it's put in CFLAGS, because it wil

Re: Odd problems trying to build an orphaned branch

2015-11-05 Thread Jeff King
On Thu, Nov 05, 2015 at 07:18:32PM -0500, Jeff King wrote: > Of course that leaves only the problem that filter-branch is > horrendously slow (for the kernel, most of the time goes to populating > the index for each commit; I think filter-branch could probably learn to > skip this step if there is

Re: Odd problems trying to build an orphaned branch

2015-11-05 Thread Jeff King
On Thu, Nov 05, 2015 at 01:16:54PM -0800, a...@clueserver.org wrote: > I created an orphan branch from 3.12-rc1. I then used git format-patch to > generate patches from 3.12-rc1 to HEAD. (Over 7000 patches.) I use git am > to apply them to the orphan branch. At patch 237 it fails to apply. (It > a

A note from the maintainer

2015-11-05 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

[ANNOUNCE] Git v2.6.3

2015-11-05 Thread Junio C Hamano
The latest maintenance release Git v2.6.3 is now available at the usual places. This contains bug & regression fixes that have already been merged to the 'master' front. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy

What's cooking in git.git (Nov 2015, #01; Thu, 5)

2015-11-05 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'. Git 2.6.3 has been tagged, with accumulated fixes and minor updates that are already in 'master'. We have about 5 weeks left til -rc0 so hopefu

FREXES | Advertising team

2015-11-05 Thread Frexes
Dear Sirs, We are an advertising company working with exclusive Luxury Brands interested in targeting high net worth audiences in UK. We would like to know more regarding advertising opportunities on your website and websites-partners if any and current rates. Let us know more about future

Re: race condition when pushing

2015-11-05 Thread Eric Sunshine
On Thu, Nov 5, 2015 at 11:11 AM, Lyle Ziegelmiller wrote: > git push --set-upstream has some sort of race condition. Some times when I > execute it, it works. Other times, it does not. Below is from my command > window. I've executed the exact same command (using bash history > re-execution, so I

Re: [PATCH] contrib/subtree: remove "push" command from the "todo" file

2015-11-05 Thread Eric Sunshine
On Thu, Nov 5, 2015 at 10:26 AM, Fabio Porcedda wrote: > Because the "push" command is already avaiable, remove it from the s/avaiable/available/ > "todo" file. > > Signed-off-by: Fabio Porcedda > --- > diff --git a/contrib/subtree/todo b/contrib/subtree/todo > @@ -12,8 +12,6 @@ >

Re: [PATCH 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Stefan Beller
On Thu, Nov 5, 2015 at 12:27 PM, Johannes Sixt wrote: > diff --git a/run-command.c b/run-command.c > index 51d078c..3e42299 100644 > --- a/run-command.c > +++ b/run-command.c > @@ -977,7 +977,7 @@ static struct parallel_processes *pp_init(int n, > for (i = 0; i < n; i++) { >

Odd problems trying to build an orphaned branch

2015-11-05 Thread alan
I am trying to create an orphaned branch that contains the linux-3.12.y branch from linux-stable. Each time I try a method to make this work I encounter a blocker that halts my progress. I expect that at least one of these is a bug, but I am not sure. Here is what I did. I have read the docs and

Re: [PATCH 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Junio C Hamano
Johannes Sixt writes: > Am 05.11.2015 um 19:17 schrieb Stefan Beller: >> strbuf_read_once can also operate on blocking file descriptors if we are >> sure they are ready. The poll (2) command however makes sure this is the >> case. >> >> Reading the manual for poll (2), there may be spurious retu

Re: [PATCH v3 0/4] Improve hideRefs when used with namespaces

2015-11-05 Thread Junio C Hamano
Thanks; will replace what has been queued. -- 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 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Johannes Sixt
Am 05.11.2015 um 19:17 schrieb Stefan Beller: > strbuf_read_once can also operate on blocking file descriptors if we are > sure they are ready. The poll (2) command however makes sure this is the > case. > > Reading the manual for poll (2), there may be spurious returns indicating > readiness but

Re: [PATCH 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Junio C Hamano
Stefan Beller writes: > On Thu, Nov 5, 2015 at 10:45 AM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> strbuf_read_once can also operate on blocking file descriptors if we are >>> sure they are ready. The poll (2) command however makes sure this is the >>> case. >>> >>> Reading the manu

Re: [PATCH 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Stefan Beller
On Thu, Nov 5, 2015 at 10:45 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> strbuf_read_once can also operate on blocking file descriptors if we are >> sure they are ready. The poll (2) command however makes sure this is the >> case. >> >> Reading the manual for poll (2), there may be spu

Re: [PATCH 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Junio C Hamano
Stefan Beller writes: > strbuf_read_once can also operate on blocking file descriptors if we are > sure they are ready. The poll (2) command however makes sure this is the > case. > > Reading the manual for poll (2), there may be spurious returns indicating > readiness but that is for network soc

Re: [PATCH v4 3/3] Move all the SHA1 implementations into one directory

2015-11-05 Thread Junio C Hamano
atous...@gmail.com writes: > From: Atousa Pahlevan Duprat > > The various SHA1 implementations were spread around in 3 directories. > This makes it easier to understand what implementations are > available at a glance. > > Signed-off-by: Atousa Pahlevan Duprat > --- I am not strongly opposed to

Re: [PATCH v4 1/3] Provide another level of abstraction for the SHA1 utilities.

2015-11-05 Thread Junio C Hamano
atous...@gmail.com writes: > From: Atousa Pahlevan Duprat > > The git source uses git_SHA1_Update() and friends to call > into the code that computes the hashes. This is can then be > mapped directly to an implementation that computes the hash, > such as platform_SHA1_Update(); or as we will do

Re: [PATCH v4 2/3] Limit the size of the data block passed to SHA1_Update()

2015-11-05 Thread Junio C Hamano
atous...@gmail.com writes: > +#ifndef git_SHA_CTX > + > +#ifdef SHA1_MAX_BLOCK_SIZE > +#include "compat/sha1-chunked.h" > +#define git_SHA_CTX platform_SHA_CTX > +#define git_SHA1_Initplatform_SHA1_Init > +#define git_SHA1_Update git_SHA1_Update_Chunked > +#de

[PATCH 2/2] strbuf: Correct documentation for strbuf_read_once

2015-11-05 Thread Stefan Beller
No need to document the O_NONBLOCK. We will read just once and return. In case the read blocks, this works too. Signed-off-by: Stefan Beller --- strbuf.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/strbuf.h b/strbuf.h index ea69665..7a08da4 100644 --- a/strbuf.h +++ b/s

[PATCH 1/2] run-command: Remove set_nonblocking

2015-11-05 Thread Stefan Beller
strbuf_read_once can also operate on blocking file descriptors if we are sure they are ready. The poll (2) command however makes sure this is the case. Reading the manual for poll (2), there may be spurious returns indicating readiness but that is for network sockets only. Pipes should be unaffect

[PATCH 0/2] Remove non-blocking fds from run-command.

2015-11-05 Thread Stefan Beller
So as far as I understand, all of the discussion participants (Torsten, Jeff, Junio and me) are convinced we don't need the non-blocking feature. So remove it. I developed it on top of d075d2604c0 (Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update) but AFAICT it also app

Re: File owner/group and git

2015-11-05 Thread David Turner
On Wed, 2015-11-04 at 18:38 -0800, Junio C Hamano wrote: > David Turner writes: > > > In unpack-trees.c, in verify_uptodate_1, we check ie_match_stat. This > > returns OWNER_CHANGED if a file has changed ownership since the index > > was updated. Do we actually care about that particular case?

Re: [PATCHv3 02/11] run-command: report failure for degraded output just once

2015-11-05 Thread Stefan Beller
On Wed, Nov 4, 2015 at 11:32 PM, Junio C Hamano wrote: > Jeff King writes: > >> POSIX implies it is the case in the definition of read[2] in two ways: >> >> 1. The O_NONBLOCK behavior for pipes is mentioned only when dealing >> with empty pipes. >> >> 2. Later, it says: >> >>The

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-05 Thread Jeff King
On Thu, Nov 05, 2015 at 12:56:54PM +0100, Knut Franke wrote: > My main takeaway from this, apart from the points you mention below, is that > it'd be good to have a test case, similar to t/lib-httpd.sh. Since none of the > existent proxy-related code has an automated test, I think this would be an

Re: [PATCH v6 25/25] refs: break out ref conflict checks

2015-11-05 Thread David Turner
On Thu, 2015-11-05 at 05:00 +0100, Michael Haggerty wrote: > On 11/04/2015 10:01 PM, David Turner wrote: > > On Tue, 2015-11-03 at 08:40 +0100, Michael Haggerty wrote: > >> + * extras and skip must be sorted lists of reference names. Either one > >> + * can be NULL, signifying the empty list. > >>

Re: [PATCH] test: accept death by SIGPIPE as a valid failure mode

2015-11-05 Thread Junio C Hamano
Lars Schneider writes: > Oh, I missed this email thread. I am still working on a stable > Travis-CI integration and I ran into this issue a few times. I > fixed it in my (not yet published) patch with an additional > function "test_must_fail_or_sigpipe" that I've used for all tests > affected by

race condition when pushing

2015-11-05 Thread Lyle Ziegelmiller
Hi git push --set-upstream has some sort of race condition. Some times when I execute it, it works. Other times, it does not. Below is from my command window. I've executed the exact same command (using bash history re-execution, so I know I didn't make a typo), repeatedly. Notice the last e

[PATCH] contrib/subtree: remove "push" command from the "todo" file

2015-11-05 Thread Fabio Porcedda
Because the "push" command is already avaiable, remove it from the "todo" file. Signed-off-by: Fabio Porcedda --- contrib/subtree/todo | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/subtree/todo b/contrib/subtree/todo index 7e44b00..0d0e777 100644 --- a/contrib/subtree/todo +++ b/c

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-05 Thread Knut Franke
On 2015-11-05 03:24, Jeff King wrote: > There was also some discussion with curl upstream of providing a new > authentication interface, where we would provide curl with > authentication callbacks, and it would trigger them if and when > credentials were needed. Somebody upstream was working on a p

[PATCH] git-svn: improve rebase/mkdirs performance

2015-11-05 Thread Dair Grant
Processing empty_dir directives becomes extremely slow for svn repositories with a large enough history. This is due to using a single hash to store the list of empty directories, with the expensive step being purging items from that hash using grep+delete. Storing directories in a hash of hashes

Re: [PATCH] test: accept death by SIGPIPE as a valid failure mode

2015-11-05 Thread Lars Schneider
> On 05 Nov 2015, at 08:47, Jeff King wrote: > > On Fri, Oct 30, 2015 at 02:22:14PM -0700, Junio C Hamano wrote: > >> On a local host, the object/history transport code often talks over >> pipe with the other side. The other side may notice some (expected) >> failure, send the error message ei

[PATCH v2] gitk: add -C commandline parameter to change path

2015-11-05 Thread Juha-Pekka Heikkila
This patch adds -C (change working directory) parameter to gitk. With this parameter, instead of need to cd to directory with .git folder, one can point the correct folder from commandline. v2: Adjusted the parameter as per Eric's suggestion. I think it now work in similar manner as in many GN

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-05 Thread Jeff King
On Wed, Nov 04, 2015 at 10:13:25AM +0100, Knut Franke wrote: > For consistency reasons, add parsing of http_proxy/https_proxy/all_proxy > environment variables, which would otherwise be evaluated as a fallback by > curl. > Without this, we would have different semantics for git configuration and