Re: [PATCHv2 0/8] Expose the submodule parallelism to the user

2015-10-29 Thread Ramsay Jones
On 28/10/15 23:21, Stefan Beller wrote: > This replaces origin/sb/submodule-parallel-update > (anchoring at 74367d8938, Merge branch 'sb/submodule-parallel-fetch' > into sb/submodule-parallel-update) > > What does it do? > --- > This series should finish the on going efforts of parallelizing >

Reply

2015-10-29 Thread
Hello My Name is Capt. Lucas Alves from the US Army base here in Damascus, Syria. I have a Deal of Sixteen Million Two Hundred Thousand United States I would like to partner with you. Kindly get back to me if it would be of interest to you for more details. Regards, Lucas Alves

Re: git fsck failure on OS X with files >= 4 GiB

2015-10-29 Thread Filipe Cabecinhas
Defining BLK_SHA1 = YesPlease (when calling make) should just change the SHA functions, instead of completely removing OpenSSL or CommonCrypto. Regards, Filipe On Thu, Oct 29, 2015 at 3:46 AM, Rafael Espíndola wrote: > Awesome, building with > > NO_OPENSSL = 1 >

Re: git-cherry doesn't detect a "copied" commit

2015-10-29 Thread Francis Moreau
Hello Junio, On Sat, Oct 24, 2015 at 12:41 AM, Junio C Hamano wrote: > Francis Moreau writes: > >> I was mislead by the git-cherry manpage somehow which says: >> >> "git-cherry therefore >> detects when commits have been "copied" by means of

Re: [PATCHv2 0/8] Expose the submodule parallelism to the user

2015-10-29 Thread Stefan Beller
On Thu, Oct 29, 2015 at 6:19 AM, Ramsay Jones wrote: > Hmm, is there a way to _not_ fetch in parallel (override the > config) from the command line for a given command? > > ATB, > Ramsay Jones git config submodule.jobs 42 git --jobs 1 # should run just one task,

Re: git fsck failure on OS X with files >= 4 GiB

2015-10-29 Thread Atousa Duprat
Here is a solution that avoids problems with OS-specific implementations of SHA_Update() by limiting the size of each update request to 1GiB and calling the function repeatedly in a loop. Atousa -- [PATCH] Limit the size of the data block passed to SHA1_Update() This avoids issues where

Re: [PATCH v3] ref-filter: fallback on alphabetical comparison

2015-10-29 Thread Karthik Nayak
On Thu, Oct 29, 2015 at 3:46 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> On Wed, Oct 28, 2015 at 1:20 AM, Junio C Hamano wrote: Hence, fallback to alphabetical comparison based on the refname whenever the other

Re: git fsck failure on OS X with files >= 4 GiB

2015-10-29 Thread Junio C Hamano
Atousa Duprat writes: > [PATCH] Limit the size of the data block passed to SHA1_Update() > > This avoids issues where OS-specific implementations use > a 32-bit integer to specify block size. Limit currently > set to 1GiB. > --- > cache.h | 20 +++- > 1 file

Re: git-gui is still using old-style git-merge invocation

2015-10-29 Thread Dennis Kaarsemaker
On do, 2015-10-29 at 18:50 +0100, Johannes Sixt wrote: > Performing a merge with git gui presents the following message in the > merge result window: > > warning: old-style 'git merge HEAD ' is deprecated. > Merge made by the 'recursive' strategy. > a | 1 + > 1 file changed, 1 insertion(+) >

Re: [PATCHv2 0/8] Expose the submodule parallelism to the user

2015-10-29 Thread Stefan Beller
On Thu, Oct 29, 2015 at 10:23 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Thu, Oct 29, 2015 at 6:19 AM, Ramsay Jones >> wrote: >> >>> Hmm, is there a way to _not_ fetch in parallel (override the >>> config) from

Re: git-fetch pulls already-pulled objects?

2015-10-29 Thread Junio C Hamano
Matt Glazar writes: > On a remote, I have two Git commit objects which point to the same tree > object (created with git commit-tree). What you are expecting _could_ be implemented by exchanging all tree and blob objects sending and receiving sides have and computing the set

Re: [PATCH] difftool: avoid symlinks when reusing worktree files

2015-10-29 Thread Junio C Hamano
David Aguilar writes: > Right. At first I thought I could revise the commit message to > make it clearer that we simply want to skip all symlinks, since > it never makes sense to reuse a worktree symlinks, but looking > at the tests and implementation makes me realize that

Re: git-fetch pulls already-pulled objects?

2015-10-29 Thread Matt Glazar
> What you are expecting _could_ be implemented by exchanging all > tree and blob objects sending and receiving sides have and computing > the set difference, but the sender and the receiver do not exchange > such a huge list. In my case, I only want to exchange the tree object hash pointed

Re: [PATCH] difftool: avoid symlinks when reusing worktree files

2015-10-29 Thread Junio C Hamano
Junio C Hamano writes: > So I think it is fine to return $use=0 for any symbolic link from > use_wt_file. Anything you do there will be replaced by the loop > over %symlink that appears later in the caller. The caller discards > $wt_sha1 when $use=0 is returned, so the

Re: git-fetch pulls already-pulled objects?

2015-10-29 Thread Matt Glazar
> I forgot to mention the recent "pack bitmap" addition. It makes the > set of "can be cheaply proven to exist" a lot larger. Cool! I tried this feature, and it worked! (At least, it worked for my small test case.) I ran on the server (after pushing the objects): git config repack.writeBitmaps

Re: git-gui is still using old-style git-merge invocation

2015-10-29 Thread Johannes Sixt
Thanks! -- 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

[PATCH] l10n: de.po: improve some translations

2015-10-29 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index c682aaf..be30642 100644 --- a/po/de.po +++ b/po/de.po @@ -592,7 +592,7 @@ msgstr "Fehler beim Schreiben der Signatur nach '%s': %s"

Re: [PATCHv2 0/8] Expose the submodule parallelism to the user

2015-10-29 Thread Junio C Hamano
Stefan Beller writes: > This replaces origin/sb/submodule-parallel-update > (anchoring at 74367d8938, Merge branch 'sb/submodule-parallel-fetch' > into sb/submodule-parallel-update) > > What does it do? > --- > This series should finish the on going efforts of parallelizing >

Re: [PATCH 0/2] checkout: added two options to control progress output

2015-10-29 Thread Jeff King
On Sat, Oct 24, 2015 at 08:59:28AM -0600, Edmundo Carmona wrote: > From: Edmundo Carmona Antoranz > > checkout will refuse to print progress information if it's not connected > to a TTY. These patches will add two options: Not just checkout, but all of git's progress code.

Re: [PATCHv2 6/8] git submodule update: have a dedicated helper for cloning

2015-10-29 Thread Junio C Hamano
Stefan Beller writes: > +struct submodule_update_clone { > + int count; > + int quiet; > + int print_unmatched; > + char *reference; > + char *depth; > + char *update; > + const char *recursive_prefix; > + const char *prefix; > + struct

Re: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

2015-10-29 Thread Junio C Hamano
Duy Nguyen writes: > On Mon, Oct 26, 2015 at 2:15 PM, Johannes Schindelin > wrote: >> When prefixing a Git call in the test suite with 'TEST_GDB_GIT=1 ', it >> will now be run with GDB, allowing the developer to debug test failures >> more

Re: [PATCHv2 0/8] Expose the submodule parallelism to the user

2015-10-29 Thread Junio C Hamano
Stefan Beller writes: > On Thu, Oct 29, 2015 at 6:19 AM, Ramsay Jones > wrote: > >> Hmm, is there a way to _not_ fetch in parallel (override the >> config) from the command line for a given command? >> >> ATB, >> Ramsay Jones > > git config

git-gui is still using old-style git-merge invocation

2015-10-29 Thread Johannes Sixt
Performing a merge with git gui presents the following message in the merge result window: warning: old-style 'git merge HEAD ' is deprecated. Merge made by the 'recursive' strategy. a | 1 + 1 file changed, 1 insertion(+) create mode 100644 a But I am unable to find where the invocation

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

2015-10-29 Thread Noam Postavsky
On Thu, Oct 29, 2015 at 8:10 PM, Jeff King wrote: > On Tue, Oct 27, 2015 at 11:46:20PM -0400, Noam Postavsky wrote: >> Perhaps we could express the auto-spawn more explicitly, something >> like "git config credential.pre-helper start-cache-daemon". A way to >> run a command before

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

2015-10-29 Thread Jeff King
On Thu, Oct 29, 2015 at 08:43:58PM -0400, Noam Postavsky wrote: > > I'm not clear on when the pre-helper would be run. Git runs the helper > > when it needs a credential. What git command would start it? > > I was just thinking in terms of our current workaround, it would have > been helpful to

Re: [PATCHv2 1/8] run_processes_parallel: Add output to tracing messages

2015-10-29 Thread Eric Sunshine
On Wed, Oct 28, 2015 at 7:21 PM, Stefan Beller wrote: > run_processes_parallel: Add output to tracing messages This doesn't really say much. I guess you mean that the intention is to delimit a section in which output from various tasks may be intermixed. Perhaps:

Re: [PATCHv2 2/8] submodule config: keep update strategy around

2015-10-29 Thread Eric Sunshine
On Wed, Oct 28, 2015 at 7:21 PM, Stefan Beller wrote: > We need the submodule update strategies in a later patch. > > Signed-off-by: Stefan Beller > Signed-off-by: Junio C Hamano > --- > diff --git a/submodule-config.c

Re: [PATCHv2 0/8] Expose the submodule parallelism to the user

2015-10-29 Thread Ramsay Jones
On 29/10/15 15:51, Stefan Beller wrote: > On Thu, Oct 29, 2015 at 6:19 AM, Ramsay Jones > wrote: > >> Hmm, is there a way to _not_ fetch in parallel (override the >> config) from the command line for a given command? >> >> ATB, >> Ramsay Jones > > git config

Re: [PATCH 0/2] checkout: added two options to control progress output

2015-10-29 Thread Edmundo Carmona Antoranz
On Thu, Oct 29, 2015 at 4:05 PM, Jeff King wrote: > On Sat, Oct 24, 2015 at 08:59:28AM -0600, Edmundo Carmona wrote: > >> From: Edmundo Carmona Antoranz >> >> checkout will refuse to print progress information if it's not connected >> to a TTY. These patches

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

2015-10-29 Thread Jeff King
On Tue, Oct 27, 2015 at 11:46:20PM -0400, Noam Postavsky wrote: > > I dunno. I think the auto-spawn is really what makes it usable; you can > > drop it in with "git config credential.helper config" and forget about > > it. Anything more fancy requires touching your login/startup files. > >

Re: [PATCH 0/2] checkout: added two options to control progress output

2015-10-29 Thread Jeff King
On Thu, Oct 29, 2015 at 06:09:06PM -0600, Edmundo Carmona Antoranz wrote: > A comment there: I think more builtins support --progress than the ones that > support --no-progress, right? Hopefully they are supported equally everywhere. Anybody using parseopt should have something like (this is

Re: Watchman/inotify support and other ways to speed up git status

2015-10-29 Thread Christian Couder
On Wed, Oct 28, 2015 at 12:54 AM, David Turner wrote: > > On Thu, 2015-10-22 at 07:59 +0200, Christian Couder wrote: >> Hi everyone, >> >> I am starting to investigate ways to speed up git status and other git >> commands for Booking.com (thanks to AEvar) and I'd be

допоможіть нашому сайту http://schoolsite.pp.ua/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок

2015-10-29 Thread admin
Доброго дня, будь ласка, просимо переглянути наш сайт, якщо це не важко для вас, http://schoolsite.pp.ua/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок, і на будь-якій сторінці один раз натисніть на рекламний банер, який вам найбільш цікавий, це Ваша допомога, щоб ми могли

Re: git fsck failure on OS X with files >= 4 GiB

2015-10-29 Thread Rafael Espíndola
Awesome, building with NO_OPENSSL = 1 NO_GETTEXT = 1 produces a working git :-) Cheers, Rafael On 28 October 2015 at 23:37, Filipe Cabecinhas wrote: > I did some debugging, and it seems CC_SHA1_Update (used by > write_sha1_file_prepare if APPLE_COMMON_CRYPTO is defined in

[PATCH v5 2/3] blame: extract find_single_final

2015-10-29 Thread Max Kirillov
Signed-off-by: Max Kirillov --- builtin/blame.c | 29 + 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 295ce92..38f6267 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2401,16 +2401,11 @@

[PATCH v5 0/3] blame: allow blame --reverse --first-parent when it makes sense

2015-10-29 Thread Max Kirillov
Update the test: * Fix style notes in tests * Remove the non-first-parent case, because it's more like fature request, and is not fixed in this batch * Rewrite the commit message, hopely now it answers better to "why" Max Kirillov (3): blame: add test to describe use of blame --reverse

[PATCH v5 1/3] blame: test to describe use of blame --reverse --first-parent

2015-10-29 Thread Max Kirillov
Reverse blame can be used to locate removal of lines which does not change adjacent lines. Such edits do not appear in non-reverse blame, because the adjacent lines last changed commit is older history, before the edit. For a big and active project which uses topic branches, or analogous feature,

[PATCH v5 3/3] blame: allow blame --reverse --first-parent when it makes sense

2015-10-29 Thread Max Kirillov
Allow combining --reverse and --first-parent if initial commit of specified range is at the first-parent chain starting from the final commit. Disable the prepare_revision_walk()'s builtin children collection, instead picking only the ones which are along the first parent chain. Signed-off-by:

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

2015-10-29 Thread Noam Postavsky
On Thu, Oct 29, 2015 at 8:50 PM, Jeff King wrote: > workaround (the real inelegance is that you are assuming that "foo" > needs run in the first place). Well, we currently check the output from "git config credential.helpers" to determine what's needed, so the inelegance here is

Re: [PATCHv2 3/8] submodule config: remove name_and_item_from_var

2015-10-29 Thread Eric Sunshine
On Wed, Oct 28, 2015 at 7:21 PM, Stefan Beller wrote: > submodule config: remove name_and_item_from_var > > By inlining `name_and_item_from_var` it is easy to add later options > which are not required to have a submodule name. I guess you're trying to say that

[PATCH] checkout: add --progress option

2015-10-29 Thread Edmundo Carmona Antoranz
Under normal circumstances, and like other git commands, git checkout will write progress info to stderr if attached to a terminal. This option allows progress to be forced even if not using a terminal. Also, progress can be skipped if using option --no-progress. Signed-off-by: Edmundo Carmona

Re: [PATCHv2 4/8] submodule-config: parse_config

2015-10-29 Thread Eric Sunshine
On Wed, Oct 28, 2015 at 7:21 PM, Stefan Beller wrote: > submodule-config: parse_config Um, what? > This rewrites parse_config to distinguish between configs specific to > one submodule and configs which apply generically to all submodules. > We do not have generic submodule

Re: git fsck failure on OS X with files >= 4 GiB

2015-10-29 Thread Atousa Duprat
Thank you for the feedback. I have revised the proposed patch as suggested, allowing the use of SHA1_MAX_BLOCK_SIZE to enable the chunked implementation. When building for OSX with the CommonCrypto library we error out if SHA1_MAX_BLOCK_SIZE is not defined, which will avoid compiling a version

Re: [PATCHv2 5/8] fetching submodules: Respect `submodule.jobs` config option

2015-10-29 Thread Eric Sunshine
On Wed, Oct 28, 2015 at 7:21 PM, Stefan Beller wrote: > This allows to configure fetching and updating in parallel > without having the command line option. > > This moved the responsibility to determine how many parallel processes > to start from builtin/fetch to submodule.c