Re: [PATCH] README: create HTTP/HTTPS links from URLs in Markdown

2017-03-01 Thread Jeff King
On Thu, Mar 02, 2017 at 07:34:21AM +, Eric Wong wrote: > Jeff King wrote: > > On Wed, Mar 01, 2017 at 10:22:04PM +, Eric Wong wrote: > > > > > Markdown supports automatic links by surrounding URLs with > > > angle brackets, as documented in > > >

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 11:07 AM, Jeff King wrote: > > So obviously the smaller object size is nice, and the diffstat is > certainly satisfying. My only qualm would be whether this conflicts with > the optimizations that Dan is working on (probably not conceptually, but >

Re: [PATCH v5 24/24] t1406: new tests for submodule ref store

2017-03-01 Thread Duy Nguyen
On Wed, Mar 1, 2017 at 10:11 PM, Michael Haggerty wrote: > By trial and error, I found that the test succeeds if I comment out the > "for_each_reflog()" test. By having that test write its results to > `/tmp` where they won't be deleted, I found that the problem is that the

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Duy Nguyen
On Thu, Mar 2, 2017 at 6:19 AM, Jeff King wrote: > You have to remember that some of the Git for Windows users are doing > horrific things like using repositories with 450MB .git/index files, and > the speed to compute the sha1 during an update is noticeable there. We probably

Re: [PATCH] mingw: use OpenSSL's SHA-1 routines

2017-03-01 Thread Johannes Sixt
Am 24.02.2017 um 22:54 schrieb Junio C Hamano: Johannes Sixt writes: I'll use the patch for daily work for a while to see whether it hurts. Please ping this thread again when you have something to add. For now, I'll demote this patch from 'next' to 'pu' when we rewind and

Re: [PATCH 01/10] submodule: decouple url and submodule existence

2017-03-01 Thread Junio C Hamano
Brandon Williams writes: > On 02/24, Junio C Hamano wrote: > >> Also as a grouping measure, submodule.active that lists submodule >> paths feels hard to use. When switching between two branches in the >> superproject that have the same submodule bound at two different >>

Plastic ATM

2017-03-01 Thread Hacked Atm
Contact us on Our Email: hacked...@gmail.com We sell plastic ATM cards with pin and cash out from ATM. They works all over the world. Our You-tube Page is : https://youtu.be/qYiCP4kIO-U

Re: [PATCH] Travis: also test on 32-bit Linux

2017-03-01 Thread Junio C Hamano
On Tue, Feb 28, 2017 at 11:17 AM, Johannes Schindelin wrote: > This patch > asks Travis CI to install a Docker image with 32-bit libraries and then > goes on to build and test Git using this 32-bit setup. > > A big thank you to Lars Schneider without whose help

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Junio C Hamano
Dan Shumow writes: > At this point, I would suggest that I take the C optimizations, > clean them up and fold them in with the diet changes Linus has > suggested. The slowdown is still 2x over block-sha1 and more over > OpenSSL. But it is better than nothing. And then if

[PATCH 01/18] lib-submodule-update.sh: reorder create_lib_submodule_repo

2017-03-01 Thread Stefan Beller
Redraw the ASCII art describing the setup using more space, such that it is easier to understand. The leaf commits are now ordered the same way the actual code is ordered. Add empty lines to the setup code separating each of the leaf commits, each starting with a "checkout -b". Signed-off-by:

[PATCH 14/18] unpack-trees: check if we can perform the operation for submodules

2017-03-01 Thread Stefan Beller
Signed-off-by: Stefan Beller --- unpack-trees.c | 131 + unpack-trees.h | 1 + 2 files changed, 123 insertions(+), 9 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 616a0ae4b2..8333da2cc9 100644 ---

[PATCH 05/18] lib-submodule-update.sh: define tests for recursing into submodules

2017-03-01 Thread Stefan Beller
Currently lib-submodule-update.sh provides 2 functions test_submodule_switch and test_submodule_forced_switch that are used by a variety of tests to ensure that submodules behave as expected. The current expected behavior is that submodules are not touched at all (see 42639d2317a for the exact

[RFCv6 PATCH 00/18] Checkout aware of Submodules!

2017-03-01 Thread Stefan Beller
previous work: https://public-inbox.org/git/20170223225735.10994-1-sbel...@google.com/ https://public-inbox.org/git/20161203003022.29797-1-sbel...@google.com/ v6: * added support for read-tree (see last patch) to see how generic the code of the previous patches is. I am pretty pleased with

RE: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Dan Shumow
I played around tweaking the code a bit more and I got our performance down to a 2.077182x slowdown with check and a 1.055961x slowdown without checking. However, that slowdown is basically with the check turned off through our API. If I rip extraneous code for storing states and checking if

Re: [PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C flag

2017-03-01 Thread Eric Wong
Stefan Beller wrote: > test_submodule_content () { > + if test "$1" == "-C" Use a single '=' for portability in sh. It's also a good idea to prefix variables with 'x' or some such, since "$1" could be "-n" or some other supported switch for test(1). So, something like:

[PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C flag

2017-03-01 Thread Stefan Beller
Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index c0d6325133..a906c92cfb 100755 --- a/t/lib-submodule-update.sh +++ b/t/lib-submodule-update.sh @@

[PATCH 11/18] update submodules: move up prepare_submodule_repo_env

2017-03-01 Thread Stefan Beller
In a later patch we need to prepare the submodule environment with another git directory, so split up the function. Also move it up in the file such that we do not need to declare the function later before using it. Signed-off-by: Stefan Beller --- submodule.c | 29

Re: Delta compression not so effective

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 4:12 PM, Marius Storm-Olsen wrote: > > No, the list of git verify-objects in the previous post was from the bottom > of the sorted list, so those are the largest blobs, ~249MB.. .. so with a 6GB window, you should easily sill have 20+ objects. Not a huge

[PATCH 15/18] read-cache, remove_marked_cache_entries: wipe selected submodules.

2017-03-01 Thread Stefan Beller
Signed-off-by: Stefan Beller --- read-cache.c | 27 +-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/read-cache.c b/read-cache.c index 9054369dd0..9a2abacf7a 100644 --- a/read-cache.c +++ b/read-cache.c @@ -18,6 +18,8 @@ #include

[PATCH 13/18] unpack-trees: pass old oid to verify_clean_submodule

2017-03-01 Thread Stefan Beller
The check (which uses the old oid) is yet to be implemented, but this part is just a refactor, so it can go separately first. Signed-off-by: Stefan Beller --- unpack-trees.c | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/unpack-trees.c

Re: [PATCH 2/2] pretty: use fmt_output_email_subject()

2017-03-01 Thread Jeff King
On Wed, Mar 01, 2017 at 11:38:57AM -0800, Junio C Hamano wrote: > On Wed, Mar 1, 2017 at 11:32 AM, Jeff King wrote: > > I would think that future callers would just need to provide a dummy > > pp->rev. I guess that logic could be pushed down into > > fmt_output_email_subject(), so

[PATCH 06/18] make is_submodule_populated gently

2017-03-01 Thread Stefan Beller
We need the gentle version in a later patch. As we have just one caller, migrate the caller. Signed-off-by: Stefan Beller --- builtin/grep.c | 2 +- submodule.c| 7 ++- submodule.h| 8 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git

[PATCH 17/18] builtin/checkout: add --recurse-submodules switch

2017-03-01 Thread Stefan Beller
Signed-off-by: Stefan Beller --- Documentation/git-checkout.txt | 7 +++ builtin/checkout.c | 28 t/lib-submodule-update.sh | 23 +-- t/t2013-checkout-submodule.sh | 5 + 4 files changed, 57

[PATCH 18/18] builtin/read-tree: add --recurse-submodules switch

2017-03-01 Thread Stefan Beller
A new known failure mode is introduced[1], which is actually not a failure but a feature in read-tree. Unlike checkout for which the recursive submodule tests were originally written, read-tree does warn about ignored untracked files that would be overwritten. For the sake of keeping the test

[PATCH 07/18] connect_work_tree_and_git_dir: safely create leading directories

2017-03-01 Thread Stefan Beller
In a later patch we'll use connect_work_tree_and_git_dir when the directory for the gitlink file doesn't exist yet. This patch makes connect_work_tree_and_git_dir safe to use for both cases of either the git dir or the working dir missing. To do so, we need to call

[PATCH 04/18] lib-submodule-update.sh: replace sha1 by hash

2017-03-01 Thread Stefan Beller
Cleaning up code by generalising it. Currently the mailing list discusses yet again how to migrate away from sha1. Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/lib-submodule-update.sh

[PATCH 08/18] update submodules: add submodule config parsing

2017-03-01 Thread Stefan Beller
Similar to b33a15b08 (push: add recurseSubmodules config option, 2015-11-17) and 027771fcb1 (submodule: allow erroneous values for the fetchRecurseSubmodules option, 2015-08-17), we add submodule-config code that is later used to parse whether we are interested in updating submodules. We need the

[PATCH 16/18] entry.c: update submodules when interesting

2017-03-01 Thread Stefan Beller
Signed-off-by: Stefan Beller --- entry.c | 30 ++ 1 file changed, 30 insertions(+) diff --git a/entry.c b/entry.c index c6eea240b6..d2b512da90 100644 --- a/entry.c +++ b/entry.c @@ -2,6 +2,7 @@ #include "blob.h" #include "dir.h" #include

[PATCH 12/18] update submodules: add submodule_move_head

2017-03-01 Thread Stefan Beller
In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. This piece of code will be used universally for all these working tree modifications as it * supports dry run to answer the question: "Is it safe to change the submodule to this

[PATCH 10/18] submodules: introduce check to see whether to touch a submodule

2017-03-01 Thread Stefan Beller
In later patches we introduce the --recurse-submodule flag for commands that modify the working directory, e.g. git-checkout. It is potentially expensive to check if a submodule needs an update, because a common theme to interact with submodules is to spawn a child process for each interaction.

[PATCH 02/18] lib-submodule-update.sh: do not use ./. as submodule remote

2017-03-01 Thread Stefan Beller
Adding the repository itself as a submodule does not make sense in the real world. In our test suite we used to do that out of convenience in some tests as the current repository has easiest access for setting up 'just a submodule'. However this doesn't quite test the real world, so let's do not

[PATCH 09/18] update submodules: add a config option to determine if submodules are updated

2017-03-01 Thread Stefan Beller
In later patches we introduce the options and flag for commands that modify the working directory, e.g. git-checkout. Have a central place to store such settings whether we want to update a submodule. Signed-off-by: Stefan Beller --- submodule.c | 6 ++ submodule.h | 1

From I. Joseph.

2017-03-01 Thread university
Greetings From Igho, I am Igho Joseph, local miner of Gold and Diamonds and have much to sell to investors contact me if interested of the above mention so we could find a ground to connect. Here are my contacts. Skype... ig.diamondsupply Cell phone +221776771176 Email...

Re: Delta compression not so effective

2017-03-01 Thread Marius Storm-Olsen
On 3/1/2017 12:30, Linus Torvalds wrote: On Wed, Mar 1, 2017 at 9:57 AM, Marius Storm-Olsen wrote: Indeed, I did do a -c pack.threads=20 --window-memory=6g to 'git repack', since the machine is a 20-core (40 threads) machine with 126GB of RAM. So I guess with these

Re: [PATCH 2/2] pretty: use fmt_output_email_subject()

2017-03-01 Thread René Scharfe
Am 01.03.2017 um 12:37 schrieb René Scharfe: Add the email-style subject prefix (e.g. "Subject: [PATCH] ") directly when it's needed instead of letting log_write_email_headers() prepare it in a static buffer in advance. This simplifies storage ownership and code flow. Signed-off-by: Rene

Re: Delta compression not so effective

2017-03-01 Thread Marius Storm-Olsen
On 3/1/2017 14:19, Martin Langhoff wrote: On Wed, Mar 1, 2017 at 8:51 AM, Marius Storm-Olsen wrote: BUT, even still, I would expect Git's delta compression to be quite effective, compared to the compression present in SVN. jar files are zipfiles. They don't delta in any

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 12:34 PM, Jeff King wrote: > > I don't think that helps. The sha1 over the pack-file takes about 1.3s > with openssl, and 5s with sha1dc. So we already know the increase there > is only a few seconds, not a few minutes. Yeah, I did a few statistics by adding

Re: [PATCH v1 1/1] git diff --quiet exits with 1 on clean tree with CRLF conversions

2017-03-01 Thread Junio C Hamano
Mike Crowe writes: > With the above patch, both "git diff" and "git diff --quiet" report that > there are no changes. Previously Git would report the extra newline > correctly. I sent an updated one that (I think) fixes the real issue, which the extra would_convert_to_git()

Re: [PATCH 6/6 v5] revert.c: delegate handling of "-" shorthand to setup_revisions

2017-03-01 Thread Junio C Hamano
Siddharth Kannan writes: > revert.c:run_sequencer calls setup_revisions right after replacing "-" with > "@{-1}" for this shorthand. A previous patch taught setup_revisions to handle > this shorthand by doing the required replacement inside revision.c:get_sha1_1. >

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Jeff King
On Wed, Mar 01, 2017 at 03:05:25PM -0800, Linus Torvalds wrote: > On Wed, Mar 1, 2017 at 2:51 PM, Johannes Schindelin > wrote: > > > > But I think bigger than just developers on Windows OS. There are many > > developers out there working on large repositories (yes,

[PATCH] README: create HTTP/HTTPS links from URLs in Markdown

2017-03-01 Thread Eric Wong
Markdown supports automatic links by surrounding URLs with angle brackets, as documented in While we're at it, update URLs to avoid redirecting clients for git-scm.com (by using HTTPS) and public-inbox.org (by adding a trailing

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Jeff King
On Wed, Mar 01, 2017 at 12:58:39PM -0800, Linus Torvalds wrote: >> I don't think that helps. The sha1 over the pack-file takes about 1.3s >> with openssl, and 5s with sha1dc. So we already know the increase there >> is only a few seconds, not a few minutes. > > OK. I guess what w could easily do

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 2:51 PM, Johannes Schindelin wrote: > > But I think bigger than just developers on Windows OS. There are many > developers out there working on large repositories (yes, much larger than > Linux). Also using Macs and Linux. I am not at all sure

Re: What's cooking in git.git (Mar 2017, #01; Wed, 1)

2017-03-01 Thread Junio C Hamano
René Scharfe writes: > Am 01.03.2017 um 23:35 schrieb Junio C Hamano: >> * rs/log-email-subject (2017-03-01) 2 commits >> - pretty: use fmt_output_email_subject() >> - log-tree: factor out fmt_output_email_subject() >> >> Code clean-up. >> >> Will merge to 'next'. > > Could

[PATCH v2 0/2] Minor changes to skip gitweb tests without Time::HiRes

2017-03-01 Thread Ævar Arnfjörð Bjarmason
This was originally just one small patch, but Jakub Narębski pointed out that calling the module "unusable" when we failed to load it was confusing, so now the start of this series is just a rephrasing of an existing error message I copied. Ævar Arnfjörð Bjarmason (2): gitweb tests: Change

Re: [PATCH 5/6 v5] merge.c: delegate handling of "-" shorthand to revision.c:get_sha1

2017-03-01 Thread Junio C Hamano
Junio C Hamano writes: > Siddharth Kannan writes: > >> The callchain for handling each argument contains the function >> revision.c:get_sha1 where the shorthand for "-" ~ "@{-1}" has already been >> implemented in a previous patch; the complete

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Johannes Schindelin
Hi, On Wed, 1 Mar 2017, Linus Torvalds wrote: > On Wed, Mar 1, 2017 at 1:56 PM, Johannes Schindelin > wrote: > > Footnote *1*: I know, it is easy to forget that some developers cannot > > choose their tools, or even their hardware. In the past, we seemed to take > >

What's cooking in git.git (Mar 2017, #01; Wed, 1)

2017-03-01 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'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Note: some may have sent updates

Re: What's cooking in git.git (Mar 2017, #01; Wed, 1)

2017-03-01 Thread René Scharfe
Am 01.03.2017 um 23:35 schrieb Junio C Hamano: > * rs/log-email-subject (2017-03-01) 2 commits > - pretty: use fmt_output_email_subject() > - log-tree: factor out fmt_output_email_subject() > > Code clean-up. > > Will merge to 'next'. Could you please squash this in? We only use a single

Re: [PATCH v2 0/2] Minor changes to skip gitweb tests without Time::HiRes

2017-03-01 Thread Junio C Hamano
Thanks, will replace what has been on 'pu'. Note that I'd dropped a double-SP from the latter one while queuing.

Re: [PATCH v8 4/6] stash: teach 'push' (and 'create_stash') to honor pathspec

2017-03-01 Thread Thomas Gummerer
On 02/28, Junio C Hamano wrote: > Thomas Gummerer writes: > > > + git reset ${GIT_QUIET:+-q} -- "$@" > > + git ls-files -z --modified -- "$@" | > > + git checkout-index -z --force --stdin > > + git

[PATCH v2 1/2] gitweb tests: Change confusing "skip_all" phrasing

2017-03-01 Thread Ævar Arnfjörð Bjarmason
Change the phrasing so that instead of saying that the CGI module is unusable, we say that it's not available. This came up on the git mailing list in <4b34e3a0-3da7-d821-2a7f-9a420ac1d...@gmail.com> from Jakub Narębski. Signed-off-by: Ævar Arnfjörð Bjarmason ---

Re: [PATCH 01/10] submodule: decouple url and submodule existence

2017-03-01 Thread Stefan Beller
IIRC most of the series is actually refactoring, i.e. providing a central function that answers "is this submodule active/initialized?" and then making use of this function. Maybe it would be easier to reroll these refactorings first without adding in the change of behavior. Off the list we

Re: [PATCH 5/6 v5] merge.c: delegate handling of "-" shorthand to revision.c:get_sha1

2017-03-01 Thread Junio C Hamano
Siddharth Kannan writes: > The callchain for handling each argument contains the function > revision.c:get_sha1 where the shorthand for "-" ~ "@{-1}" has already been > implemented in a previous patch; the complete callchain leading to that > function is: > > 1.

Re: [PATCH v8 4/6] stash: teach 'push' (and 'create_stash') to honor pathspec

2017-03-01 Thread Junio C Hamano
Thomas Gummerer writes: > On 02/28, Junio C Hamano wrote: >> Thomas Gummerer writes: >> >> > + git reset ${GIT_QUIET:+-q} -- "$@" >> > + git ls-files -z --modified -- "$@" | >> > + git checkout-index

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 1:56 PM, Johannes Schindelin wrote: > Footnote *1*: I know, it is easy to forget that some developers cannot > choose their tools, or even their hardware. In the past, we seemed to take > appropriate care, though. I don't think you need to worry

[PATCH v2 2/2] gitweb tests: Skip tests when we don't have Time::HiRes

2017-03-01 Thread Ævar Arnfjörð Bjarmason
Change the gitweb tests to skip when we can't load the Time::HiRes module. Gitweb needs this module to work. It has been in perl core since v5.8, which is the oldest version we support. However CentOS (and perhaps some other distributions) carve it into its own non-core-perl package that's not

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Johannes Schindelin
Hi, On Wed, 1 Mar 2017, Junio C Hamano wrote: > Linus Torvalds writes: > > > That said, I think that it would be lovely to just default to > > USE_SHA1DC and just put the whole attack behind us. Yes, it's slower. > > No, it doesn't really seem to matter that much

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Junio C Hamano
On Wed, Mar 1, 2017 at 1:56 PM, Johannes Schindelin wrote: > Hi, > > On Wed, 1 Mar 2017, Junio C Hamano wrote: > >> Linus Torvalds writes: >> >> > That said, I think that it would be lovely to just default to >> > USE_SHA1DC and just put

Re: [PATCH v1 1/1] git diff --quiet exits with 1 on clean tree with CRLF conversions

2017-03-01 Thread Junio C Hamano
Now I thought about it through a bit more thoroughly, I think this is the right approach, so here is my (tenative) final version. I seem to be getty really rusty---after all the codepaths involved are practically all my code and I should have noticed the real culprit during my first attempt X-<.

Re: SHA1 collisions found

2017-03-01 Thread Jeff King
On Tue, Feb 28, 2017 at 03:11:32PM -0800, Linus Torvalds wrote: > > Of course for dedicated code this can be simplified, and some parts > > could be further optimized. > > So I'd be worried about changing your tested code too much, since the > only test-cases we have are the two pdf files. If we

Re: [PATCH v4 17/22] read-cache: unlink old sharedindex files

2017-03-01 Thread Junio C Hamano
Christian Couder writes: > +static int can_delete_shared_index(const char *shared_index_path) > +{ > + struct stat st; > + unsigned long expiration; > + > + /* Check timestamp */ > + expiration = get_shared_index_expire_date(); > + if (!expiration)

Re: [PATCH v4 00/22] Add configuration options for split-index

2017-03-01 Thread Junio C Hamano
Christian Couder writes: > Highlevel view of the patches in the series > ~~~ > > Except for patch 1/22 and 1/22, there are 3 big steps, one for each > new configuration variable introduced. > > There only small differences

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Jeff King
On Wed, Mar 01, 2017 at 12:14:34PM -0800, Linus Torvalds wrote: > > My biggest concern is the index-pack operation. Try this: > > I'm mobile right now, so I can't test, but I'd this perhaps at least partly > due to the full checksum over the pack-file? > > We have two very different uses of

Re: [PATCH v4 15/22] read-cache: touch shared index files when used

2017-03-01 Thread Junio C Hamano
Christian Couder writes: > +/* > + * Signal that the shared index is used by updating its mtime. > + * > + * This way, shared index can be removed if they have not been used > + * for some time. > + */ > +static void freshen_shared_index(char *base_sha1_hex, int warn)

Re: [PATCH v1 1/1] git diff --quiet exits with 1 on clean tree with CRLF conversions

2017-03-01 Thread Mike Crowe
On Wednesday 01 March 2017 at 18:04:44 +0100, tbo...@web.de wrote: > From: Junio C Hamano > > git diff --quiet may take a short-cut to see if a file is changed > in the working tree: > Whenever the file size differs from what is recorded in the index, > the file is assumed to

Re: [PATCH v1 1/1] git diff --quiet exits with 1 on clean tree with CRLF conversions

2017-03-01 Thread Junio C Hamano
tbo...@web.de writes: > From: Junio C Hamano > > git diff --quiet may take a short-cut to see if a file is changed > in the working tree: > Whenever the file size differs from what is recorded in the index, > the file is assumed to be changed and git diff --quiet returns >

Re: Delta compression not so effective

2017-03-01 Thread Martin Langhoff
On Wed, Mar 1, 2017 at 8:51 AM, Marius Storm-Olsen wrote: > BUT, even still, I would expect Git's delta compression to be quite > effective, compared to the compression present in SVN. jar files are zipfiles. They don't delta in any useful form, and in fact they differ even

Re: Delta compression not so effective

2017-03-01 Thread Martin Langhoff
On Wed, Mar 1, 2017 at 1:30 PM, Linus Torvalds wrote: > For example, the sorting code thinks that objects with the same name > across the history are good sources of deltas. Marius has indicated he is working with jar files. IME jar and war files, which are

Re: git status --> Out of memory, realloc failed

2017-03-01 Thread Carsten Fuchs
Hi René, Am 01.03.2017 um 11:02 schrieb René Scharfe: I use Git at a web hosting service, where my user account has a memory limit of 768 MB: (uiserver):p7715773:~$ uname -a Linux infongp-de15 3.14.0-ui16322-uiabi1-infong-amd64 #1 SMP Debian 3.14.79-2~ui80+4 (2016-11-17) x86_64 GNU/Linux

Re: Delta compression not so effective

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 9:57 AM, Marius Storm-Olsen wrote: > > Indeed, I did do a > -c pack.threads=20 --window-memory=6g > to 'git repack', since the machine is a 20-core (40 threads) machine with > 126GB of RAM. > > So I guess with these sized objects, even at 6GB per

Re: [PATCH 01/10] submodule: decouple url and submodule existence

2017-03-01 Thread Brandon Williams
On 02/24, Junio C Hamano wrote: > Brandon Williams writes: > > > Currently the submodule..url config option is used to determine > > if a given submodule exists and is interesting to the user. This > > however doesn't work very well because the URL is a config option for > >

Re: [PATCH 3/6] Introduce a new "printf format" for timestamps

2017-03-01 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Schindelin writes: > >> So let's introduce the pseudo format "PRItime" (currently simply being >> "lu") so that it is easy later on to change the data type to time_t. > > The problem being solved is a good thing to

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Junio C Hamano
Linus Torvalds writes: > That said, I think that it would be lovely to just default to > USE_SHA1DC and just put the whole attack behind us. Yes, it's slower. > No, it doesn't really seem to matter that much in practice. Yes. It would be a very good goal.

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Jeff King
On Wed, Mar 01, 2017 at 10:49:55AM -0800, Linus Torvalds wrote: > That said, I think that it would be lovely to just default to > USE_SHA1DC and just put the whole attack behind us. Yes, it's slower. > No, it doesn't really seem to matter that much in practice. My biggest concern is the

Re: [PATCH 2/2] pretty: use fmt_output_email_subject()

2017-03-01 Thread Junio C Hamano
On Wed, Mar 1, 2017 at 11:32 AM, Jeff King wrote: > I would think that future callers would just need to provide a dummy > pp->rev. I guess that logic could be pushed down into > fmt_output_email_subject(), so that it skips looking at > opt->subject_prefix, etc, when "opt" is NULL,

Re: [PATCH 2/2] pretty: use fmt_output_email_subject()

2017-03-01 Thread Jeff King
On Wed, Mar 01, 2017 at 10:08:10AM -0800, Junio C Hamano wrote: > > strbuf_grow(sb, title.len + 1024); > > - if (pp->subject) { > > - strbuf_addstr(sb, pp->subject); > > + if (pp->print_email_subject) { > > + if (pp->rev) > > +

Re: [PATCH v7 3/3] config: add conditional include

2017-03-01 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > int git_config_include(const char *var, const char *value, void *data) > { > struct config_include_data *inc = data; > + const char *cond, *key; > + int cond_len; > int ret; > > /* > @@ -185,6 +271,12 @@ int

Hello

2017-03-01 Thread university
Please kindly reply me if this your email is still in use. Sincerely yours Anessa...t

Re: [PATCH 2/2] pretty: use fmt_output_email_subject()

2017-03-01 Thread Jeff King
On Wed, Mar 01, 2017 at 12:37:07PM +0100, René Scharfe wrote: > Add the email-style subject prefix (e.g. "Subject: [PATCH] ") directly > when it's needed instead of letting log_write_email_headers() prepare > it in a static buffer in advance. This simplifies storage ownership and > code flow.

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Jeff King
On Tue, Feb 28, 2017 at 04:30:26PM -0800, Linus Torvalds wrote: > From: Linus Torvalds > Date: Tue, 28 Feb 2017 16:12:32 -0800 > Subject: [PATCH] Put sha1dc on a diet > > This removes the unnecessary parts of the sha1dc code, shrinking things from > [...] So

Re: gpg verify git sub modules useful?

2017-03-01 Thread Stefan Beller
On Wed, Mar 1, 2017 at 10:28 AM, Patrick Schleizer wrote: > Good questions, thank you for trying to figure out what I am asking. :) > > Junio C Hamano: >> Patrick Schleizer writes: >> >>> When using git submodules, is there value

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 10:42 AM, Junio C Hamano wrote: > I see //c99 comments sha1dc is already full of // style comments. I just followed the existing practice. > and also T array[] = { [58] = val } both of > which I think we stay away from (and the former is from the

Re: [PATCH] Put sha1dc on a diet

2017-03-01 Thread Junio C Hamano
Linus Torvalds writes: > I notice that sha1dc is in the 'pu' branch now, so let's put my money > where my mouth is, and send in the sha1dc diet patch. I see //c99 comments and also T array[] = { [58] = val } both of which I think we stay away from (and the former

[PATCH v1 1/1] git diff --quiet exits with 1 on clean tree with CRLF conversions

2017-03-01 Thread tboegi
From: Junio C Hamano git diff --quiet may take a short-cut to see if a file is changed in the working tree: Whenever the file size differs from what is recorded in the index, the file is assumed to be changed and git diff --quiet returns exit with code 1 This shortcut must be

Re: gpg verify git sub modules useful?

2017-03-01 Thread Patrick Schleizer
Good questions, thank you for trying to figure out what I am asking. :) Junio C Hamano: > Patrick Schleizer writes: > >> When using git submodules, is there value in iterating about the git >> submodules running "git verfiy-commit HEAD" or would that be already

Re: [PATCH 3/6] Introduce a new "printf format" for timestamps

2017-03-01 Thread Junio C Hamano
Johannes Schindelin writes: > So let's introduce the pseudo format "PRItime" (currently simply being > "lu") so that it is easy later on to change the data type to time_t. The problem being solved is a good thing to solve, and > - printf("author-time %lu\n",

Re: [PATCH 2/2] pretty: use fmt_output_email_subject()

2017-03-01 Thread Junio C Hamano
René Scharfe writes: > Add the email-style subject prefix (e.g. "Subject: [PATCH] ") directly > when it's needed instead of letting log_write_email_headers() prepare > it in a static buffer in advance. This simplifies storage ownership and > code flow. It certainly does. At

Re: Delta compression not so effective

2017-03-01 Thread Marius Storm-Olsen
On 3/1/2017 11:36, Linus Torvalds wrote: On Wed, Mar 1, 2017 at 5:51 AM, Marius Storm-Olsen wrote: When first importing, I disabled gc to avoid any repacking until completed. When done importing, there was 209GB of all loose objects (~670k files). With the hopes of quick

Re: [PATCH v7 0/3] Conditional config include

2017-03-01 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Nguyễn Thái Ngọc Duy (3): > config.txt: clarify multiple key values in include.path > config.txt: reflow the second include.path paragraph > config: add conditional include Thanks. The primary change looked good (it looked good already

Re: [PATCH v7 1/3] config.txt: clarify multiple key values in include.path

2017-03-01 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The phrasing in this paragraph may give an impression that you can only > use it once. Rephrase it a bit. > > Helped-by: Philip Oakley > Signed-off-by: Nguyễn Thái Ngọc Duy > --- >

Re: Delta compression not so effective

2017-03-01 Thread Linus Torvalds
On Wed, Mar 1, 2017 at 5:51 AM, Marius Storm-Olsen wrote: > > When first importing, I disabled gc to avoid any repacking until completed. > When done importing, there was 209GB of all loose objects (~670k files). > With the hopes of quick consolidation, I did a > git -c

Re: [BUG] branch renamed to 'HEAD'

2017-03-01 Thread Junio C Hamano
Jacob Keller writes: > I didn't find any problems besides what you had already outlined > before I started reading the series. It looks pretty much like I > thought it would. I like the idea of saying "I want X" rather than the > command returning "This was a Y" Yeah,

Re: [PATCH 0/6] Use time_t

2017-03-01 Thread Junio C Hamano
Jeff King writes: > On Tue, Feb 28, 2017 at 02:27:22PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > ... We can certainly stick with it for now (it's awkward if you >> > really do have an entry on Jan 1 1970, but other than that it's an OK >> >

Re: Delta compression not so effective

2017-03-01 Thread Junio C Hamano
On Wed, Mar 1, 2017 at 5:51 AM, Marius Storm-Olsen wrote: > ... which brought it down to 206GB in a single pack. I then ran > git repack -a -d -F --window=350 --depth=250 > which took it down to 203GB, where I'm at right now. Just a hunch. s/F/f/ perhaps? "-F" does not

Re: [PATCH v7 3/3] config: add conditional include

2017-03-01 Thread Ramsay Jones
On 01/03/17 11:26, Nguyễn Thái Ngọc Duy wrote: > Sometimes a set of repositories want to share configuration settings > among themselves that are distinct from other such sets of repositories. > A user may work on two projects, each of which have multiple > repositories, and use one user.email

Re: Delta compression not so effective

2017-03-01 Thread Junio C Hamano
On Wed, Mar 1, 2017 at 8:06 AM, Junio C Hamano wrote: > Just a hunch. s/F/f/ perhaps? "-F" does not allow Git to recover from poor Nah, sorry for the noise. Between -F and -f there shouldn't be any difference.

Re: [PATCH v5 24/24] t1406: new tests for submodule ref store

2017-03-01 Thread Michael Haggerty
On 03/01/2017 01:34 PM, Duy Nguyen wrote: > On Wed, Mar 1, 2017 at 12:34 AM, Michael Haggerty > wrote: >> On 02/22/2017 03:04 PM, Nguyễn Thái Ngọc Duy wrote: >>> Signed-off-by: Nguyễn Thái Ngọc Duy >>> --- >>> t/t1406-submodule-ref-store.sh (new +x) |

Delta compression not so effective

2017-03-01 Thread Marius Storm-Olsen
I have just converted an SVN repo to Git (using SubGit), where I feel delta compression has let me down :) Suffice it to say, this is a "traditional" SVN repo, with an extern/ blown out of proportion with many binary check-ins. BUT, even still, I would expect Git's delta compression to be

Re: [PATCH v5 24/24] t1406: new tests for submodule ref store

2017-03-01 Thread Duy Nguyen
On Wed, Mar 1, 2017 at 12:34 AM, Michael Haggerty wrote: > On 02/22/2017 03:04 PM, Nguyễn Thái Ngọc Duy wrote: >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> t/t1406-submodule-ref-store.sh (new +x) | 95 >> + >> 1 file

  1   2   >