Anomaly with the new code - Re: git-svn performance

2014-10-24 Thread Hin-Tak Leung
I keep tabs of a particular svn repository over many years and run git svn fetch --all every few days. So that's the old clone. Since this discussion started, I made a new one with git 2.1.0 patched with the first two patches below, a couple of weeks ago. And I ran 'git svn fetch --all' on both

[PATCH] Expand on impact of threads on memory consumption.

2014-10-24 Thread Robert de Bath
It took me a long time to notice the rider on the pack.threads configuration option that it would multiple the memory consumption by the number of CPUs in the machine. This patch puts the memory consumption warning against the memory option that I was using to try to stop git-pack running out of

Re: squash commits deep down in history

2014-10-24 Thread Jakub Narębski
W dniu 2014-10-23 22:08, Johannes Sixt pisze: Am 23.10.2014 um 14:34 schrieb Henning Moll: i need to squash several commits into a single one in a automated way. I know that there is interactive rebase, which can also be automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very

Fatal: hash is corrupted can be caused by wrong permissions

2014-10-24 Thread R. David Murray
A quick search of your mailing list didn't turn up any good hits (not the most searchable terms and gmane search doesn't seem to support phrases), so I'm reporting this. On git 1.7.1 I ran into the Fatal corruption error in one of my projects. For reasons that are irrelevant I was operating on

Re: Fatal: hash is corrupted can be caused by wrong permissions

2014-10-24 Thread Matthieu Moy
R. David Murray rdmur...@bitdance.com writes: On git 1.7.1 I ran into the Fatal corruption error in one of my projects. For reasons that are irrelevant I was operating on the repo as user X, a member of group Z, but the files were all owned by Y:Z, with (I thought) -rw-rw--- permissions.

Re: [PATCHv2] push: heed user.signingkey for signed pushes

2014-10-24 Thread Michael J Gruber
Junio C Hamano schrieb am 23.10.2014 um 00:05: Michael J Gruber g...@drmicha.warpmail.net writes: push --signed promises to take user.signingkey as the signing key but fails to read the config. Make it do so. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Okay, I guess

Re: [PATCHv2] push: heed user.signingkey for signed pushes

2014-10-24 Thread Michael J Gruber
Junio C Hamano schrieb am 23.10.2014 um 01:47: Junio C Hamano gits...@pobox.com writes: Michael J Gruber g...@drmicha.warpmail.net writes: push --signed promises to take user.signingkey as the signing key but fails to read the config. Make it do so. Signed-off-by: Michael J Gruber

aeou

2014-10-24 Thread Zhao Wei
-- 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] t/lib-gpg: make gpghome files writable

2014-10-24 Thread Michael J Gruber
t/lib-gpg.sh copies the test environment's gpg home to the trash directory and makes sure the directoty is writable. Make sure the copied files are writable, too. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/lib-gpg.sh | 1 + 1 file changed, 1 insertion(+) diff --git

Re: [PATCH 1/2] Documentation/technical: signature formats

2014-10-24 Thread Michael J Gruber
Junio C Hamano schrieb am 22.10.2014 um 21:02: Michael J Gruber g...@drmicha.warpmail.net writes: Various formats for storing signatures have accumulated by now. Document them to keep track (and maybe avoid yet another one). I haven't looked at the description closely, but it is a good

[BUG]

2014-10-24 Thread Lyle Ziegelmiller
Hello I've been attempting to use Cygwin's Git version 2.1.1 to manage pictures on my 32-bit PC and my 64-bit laptop, both running Windows 7. I downloaded the correct 32/64-bit version of Cygwin on both machines. In my pictures folder on my PC, I created a git repository and did an git add .,

Re: [PATCHv2] push: heed user.signingkey for signed pushes

2014-10-24 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: If I do that, I get: gpg: can't create `/home/mjg/src/git/t/trash directory.t5534-push-signed/gpghome/random_seed': Permission denied So I we do copy the env around. Problems arise only when the original copy ends up ro. We can guard

Re: [PATCHv2] push: heed user.signingkey for signed pushes

2014-10-24 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Ooops, I'm sorry. That must have sneaked in from running gpg with that home to see which keys we have in the test env. No change in trustdb intended. Probably gpg did some automatic trustdb recalculations, even though all I did was gpg

Question On Hooks

2014-10-24 Thread Matt Schmidt
Hi, I was curious if there was any work done on a possible Git client-side hook for post-fetch? Not sure if this is a valid question or even the idea is valid for Git but my thoughts are to fire a script after a successful fetch (delta change) has been received for a local repository - any

Re: [PATCH 1/2] Documentation/technical: signature formats

2014-10-24 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano schrieb am 22.10.2014 um 21:02: Michael J Gruber g...@drmicha.warpmail.net writes: Various formats for storing signatures have accumulated by now. Document them to keep track (and maybe avoid yet another one). I haven't

Re: [PATCH] Expand on impact of threads on memory consumption.

2014-10-24 Thread Junio C Hamano
Robert de Bath rdeb...@tvisiontech.co.uk writes: diff --git a/Documentation/config.txt b/Documentation/config.txt index c55c22a..6384038 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1828,7 +1828,10 @@ pack.depth:: pack.windowMemory:: The window memory

[PATCH v2] part1: l10n: de.po: use imperative form for command options

2014-10-24 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 166 +++ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/po/de.po b/po/de.po index e5d2b25..1285d57 100644 --- a/po/de.po +++ b/po/de.po @@ -70,7 +70,7 @@

[PATCH v2] part3: l10n: de.po: use imperative form for command options

2014-10-24 Thread Ralf Thielow
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 160 +++ 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/po/de.po b/po/de.po index b3a1762..dbcf6a9 100644 --- a/po/de.po +++ b/po/de.po @@ -4648,31

Re: [PATCH] Expand on impact of threads on memory consumption.

2014-10-24 Thread Robert de Bath
... text unnecessarily opaque ... Yes, that's quite likely. However, I think you should continue to have a similar form to the previous 'pack.window' and 'pack.depth' descriptions... perhaps: The maximum size of memory that is consumed by each thread in linkgit:git-pack-objects[1] for

[PATCH] builtin/merge.c: drop a parameter that is never used

2014-10-24 Thread Junio C Hamano
Since the very beginning when we added the renormalizing parameter to this function with 7610fa57 (merge-recursive --renormalize, 2010-08-05), nobody seems to have ever referenced it. Signed-off-by: Junio C Hamano gits...@pobox.com --- * ... or is there any renormalization the said commit meant

Re: [PATCH] builtin/merge.c: drop a parameter that is never used

2014-10-24 Thread Jonathan Nieder
Junio C Hamano wrote: Since the very beginning when we added the renormalizing parameter to this function with 7610fa57 (merge-recursive --renormalize, 2010-08-05), nobody seems to have ever referenced it. Signed-off-by: Junio C Hamano gits...@pobox.com Reviewed-by: Jonathan Nieder

[PATCH] merge sequencer: unify codepaths that write Conflicts: hint

2014-10-24 Thread Junio C Hamano
Two identical loops in suggest_conflicts() in merge, and do_recursive_merge() in sequencer, can use a single helper function extracted from the latter that prepares the Conflicts: hint that is meant to remind the user the paths for which merge conflicts had to be resolved to write a better commit

[PATCH] merge sequencer: turn Conflicts: hint into a comment

2014-10-24 Thread Junio C Hamano
Just like other hints such as Change to be committed we show in the editor to remind the committer what paths were involved in the resulting commit to improve their log message, this section is merely a reminder. Traditionally, it was not made into comments primarily because it has to be

Re: life cycle documentation

2014-10-24 Thread brian m. carlson
On Thu, Oct 23, 2014 at 05:15:21PM -0500, Ben Harper wrote: Greetings, I am unable to find any documentation regarding the life cycle regarding the various versions of git. Is only the current version supported? What about older minor/major versions? At what point does a version go EOL?

What's cooking in git.git (Oct 2014, #06; Fri, 24)

2014-10-24 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'. You can find the changes described here in the integration branches of the repositories listed at

Re: [PATCH] git-svn: clear global SVN pool between get_log invocations

2014-10-24 Thread Eric Wong
Eric Wong normalper...@yhbt.net wrote: + SVN::Core-gpool-clear; Unfortunately, SVN::Core-gpool is not available in older SVN, but I'm cooking a better patch which saves even more memory. -- To unsubscribe from this list: send the line unsubscribe git in the body of a

[PATCH] git-svn: reload RA every log-window-size

2014-10-24 Thread Eric Wong
Despite attempting to use local memory pools everywhere we can, (including our call to SVN::Ra::do_update and all subsequent reporter calls), there does not appear to be a way to force the Git::SVN::Fetcher callbacks to use a pool other than the per-SVN::Ra pool. Git::SVN::Fetcher ends up using

Re: Anomaly with the new code - Re: git-svn performance

2014-10-24 Thread Eric Wong
Hin-Tak Leung ht...@users.sourceforge.net wrote: I keep tabs of a particular svn repository over many years and run git svn fetch --all every few days. So that's the old clone. Since this discussion started, I made a new one with git 2.1.0 patched with the first two patches below, a couple of

Re: git-svn performance

2014-10-24 Thread Eric Wong
Hin-Tak Leung ht...@users.sourceforge.net wrote: Comparing trunk of old and new, I see one difference - One short commit message is missing in the *old* (the Add checkPoFiles etc. part) and so all the sha1 afterwards differed. Is that an old bug that's fixed and therefore I should throw away