Re: [PATCH] git-svn: merge: fix rooturl/branchurl match check

2014-10-19 Thread Eric Wong
Tommaso Colombo wrote: > When populating svn:mergeinfo, git-svn merge checks if the merge parent > of the merged branch is under the same root as the git-svn repository. > This was implemented comparing $gs->repos_root with the return value of > of cmt_metadata for the merge parent. However, the f

Re: [PATCH] git-svn.txt: advertise pushurl with dcommit

2014-10-19 Thread Eric Wong
Sveinung Kvilhaugsvik wrote: > Advertise that the svn-remote..pushurl config key allows specifying > the commit URL for the entire SVN repository in the documenation of git > svn's dcommit command. > > Signed-off-by: Sveinung Kvilhaugsvik Thanks, minor grammar+spelling fix to the commit message

Re: [PATCH 0/4] Multiple worktrees vs. submodules fixes

2014-10-19 Thread Max Kirillov
On Sun, Oct 19, 2014 at 09:30:15PM +0200, Jens Lehmann wrote: > Am 16.10.2014 um 22:54 schrieb Max Kirillov: >> On Wed, Oct 15, 2014 at 08:57:20PM +0200, Jens Lehmann wrote: >>> Am 15.10.2014 um 00:15 schrieb Max Kirillov: I think the logic can be simple: it a submodule is not checked-out

Re: git-svn performance

2014-10-19 Thread Eric Wong
Jakob Stoklund Olesen wrote: > If cached_mergeinfo is using too much memory, you can probably drop > that cache entirely. IIRC, it didn't give that much of a speed up. > > I am surprised that it is using a lot of memory, though. There is only > one entry per SVN branch. Something like the below?

[PATCH v2 1/3] Documentation: adjust document title underlining

2014-10-19 Thread brian m. carlson
AsciiDoc specification states that in two-line titles, the title underline has to be the same length as the title text, plus or minus two characters. Asciidoctor, however, requires that this must be plus or minus one character. Adjust the underlines to be the same length as the title text to impr

[PATCH v2 0/3] Allow building Git with Asciidoctor

2014-10-19 Thread brian m. carlson
This series is designed to implement the changes necessary to build Git using Asciidoctor instead of AsciiDoc. The first two patches are bug fixes, and are unchanged from v1. Asciidoctor is stricter about some aspects of formatting, and these patches are required to make the documentation build co

[PATCH v2 3/3] Documentation: move some AsciiDoc parameters into variables

2014-10-19 Thread brian m. carlson
Asciidoctor takes slightly different arguments from AsciiDoc in some cases. It has a different name for the HTML backend and the "docbook" backend produces DocBook 5, not DocBook 4.5. Also, Asciidoctor does not accept the -f option. Move these values into variables so that they can be overridden

[PATCH v2 2/3] Documentation: fix mismatched delimiters in git-imap-send

2014-10-19 Thread brian m. carlson
The documentation for git-imap-send uses block delimiters with mismatched lengths, which Asciidoctor doesn't support. As a result, the page is misrendered. Adjust the delimiters so that they are of the same length. Signed-off-by: brian m. carlson --- Documentation/git-imap-send.txt | 4 ++-- 1

Re: [PATCH] t1304: Set LOGNAME even if USER is unset or null

2014-10-19 Thread Junio C Hamano
"W. Trevor King" writes: > Previous LOGNAME discussion: > > * Michael Gruber on 2011-05-06 suggesting a discussing a whoami > fallback [1] (but whoami isn't POSIX). > * René Scharfe on 2011-10-14 suggesting USER as a fallback for > LOGNAME [2]. > * Matthieu Moy on 2012-09-17 suggesting droppi

Re: [PATCH V2B] core.filemode may need manual action

2014-10-19 Thread Junio C Hamano
Torsten Bögershausen writes: > Does this makes more sence ? Giving the links in-line in the text and avoiding to repeat the same information at the end like this version does probably makes sense. Good thinking. Thanks. > > Documentation/config.txt | 23 ++- > 1 file chang

Re: [PATCH V2] core.filemode may need manual action

2014-10-19 Thread Junio C Hamano
Torsten Bögershausen writes: > - The '+' at an otherwise empty line generates an empty line > in html, so s/^$/+/ I think the rule is actually that you cannot have multiple paragraphs in an enumerated list the same "headword double-colon and then indented paragraph" way, and need to unindent s

Re: [PATCH] doc: fix 'git status --help' character quoting

2014-10-19 Thread Junio C Hamano
Philip Oakley writes: > Correct backtick quoting for some of the modification states to give > consistent web rendering. This is to match the way how "XY PATH1 -> PATH2" is typeset, I presume. Some in the body text are already `XY` to match, but some others are not, and you are fixing them, all

Re: [PATCH 0/4] Multiple worktrees vs. submodules fixes

2014-10-19 Thread Jens Lehmann
Am 17.10.2014 um 11:14 schrieb Duy Nguyen: On Thu, Oct 16, 2014 at 12:09 AM, Junio C Hamano wrote: Hmph. I was hoping that the multiple-work-trees topic was ready for 'next' by now, but we may want to wait to see how the interaction with submodule plays out to have another chance of a clean re

Re: [PATCH 0/4] Multiple worktrees vs. submodules fixes

2014-10-19 Thread Jens Lehmann
Am 16.10.2014 um 22:54 schrieb Max Kirillov: On Wed, Oct 15, 2014 at 08:57:20PM +0200, Jens Lehmann wrote: Am 15.10.2014 um 00:15 schrieb Max Kirillov: I think the logic can be simple: it a submodule is not checked-out in the repository "checkout --to" is called from, then it is not checked-out

Please reply

2014-10-19 Thread Jose Calvache
Dear Sir/Madam, Here is a pdf attachment of my proposal to you. Please read and reply I would be grateful. Jose Calvache -- 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-

Re: git-svn performance

2014-10-19 Thread Jakob Stoklund Olesen
> On Oct 18, 2014, at 19:33, Eric Wong wrote: > > Eric Wong wrote: >> This reduces hash lookups for looking up cache data and will >> simplify tying data to disk in the next commit. > > I considered the following, but GDBM might not be readily available on > non-POSIX platforms. I think the o

Re: git svn's performance issue and strange pauses, and other thing

2014-10-19 Thread Jakob Stoklund Olesen
On Oct 18, 2014, at 21:12, Eric Wong wrote: >> I am somwhat worry about the dramatic difference between the two >> .svn/.caches - >> check_cherry_pick.yaml is 225MB in one and 73MB in the other, and also >> _rev_list.yaml is opposite - 24MB vs 73MB. How do I reconcile that? > > Calling patterns

Re: git svn's performance issue and strange pauses, and other thing

2014-10-19 Thread Hin-Tak Leung
(sorry about the last blank reply - mobile phone and finger accident...) -- On Sun, Oct 19, 2014 05:12 BST Eric Wong wrote: >Hin-Tak Leung wrote: > The new clone has: > > <-- > $ ls -ltr .git/svn/.caches/ > total 144788 > -rw-rw-r--. 1 Hin-Tak Hin-Tak  1166138 Oct  7

[PATCH] doc: fix 'git status --help' character quoting

2014-10-19 Thread Philip Oakley
Correct backtick quoting for some of the modification states to give consistent web rendering. While at it, use 00 for ASCII NUL to avoid any confusion with the letter O. Signed-off-by: Philip Oakley --- Noticed when reviewing a stackoverflow problem where the OP actually desired to just list t

Re: git svn's performance issue and strange pauses, and other thing

2014-10-19 Thread Hin-Tak Leung
-- On Sun, Oct 19, 2014 05:12 BST Eric Wong wrote: >Hin-Tak Leung wrote: > The new clone has: > > <-- > $ ls -ltr .git/svn/.caches/ > total 144788 > -rw-rw-r--. 1 Hin-Tak Hin-Tak 1166138 Oct 7 13:44 lookup_svn_merge.yaml > -rw-rw-r--. 1 Hin-Tak Hin-Tak 72849741

Re: [RFC/PATCH] fsck: do not canonicalize modes in trees we are checking

2014-10-19 Thread Ben Aveling
On 16/10/14 11:20, Jeff King wrote: On Thu, Oct 16, 2014 at 10:46:19AM +1100, Ben Aveling wrote: I have a corrupt repository, and every time I run fsck, it reports one corrupt object, then stops. Corrupt how? Bit-corruption, or a malformed object? Bit-corruption, in multiple places. If you ha

[PATCH 2/2] use env_array member of struct child_process

2014-10-19 Thread René Scharfe
Convert users of struct child_process to using the managed env_array for specifying environment variables instead of supplying an array on the stack or bringing their own argv_array. This shortens and simplifies the code and ensures automatically that the allocated memory is freed after use. Sign

[PATCH 1/2] run-command: add env_array, an optional argv_array for env

2014-10-19 Thread René Scharfe
Similar to args, add a struct argv_array member to struct child_process that simplifies specifying the environment for children. It is freed automatically by finish_command() or if start_command() encounters an error. Suggested-by: Jeff King Signed-off-by: Rene Scharfe --- Documentation/techni

Re: [PATCH] receive-pack: plug minor memory leak in unpack()

2014-10-19 Thread René Scharfe
Am 14.10.2014 um 11:16 schrieb Jeff King: On Mon, Oct 13, 2014 at 12:08:09PM -0700, Junio C Hamano wrote: I wonder if run-command should provide a managed env array similar to the "args" array. That's a good idea. I took a look at a few of them: I took a brief look, too. I had hoped we

Re: [PATCH] object: make add_object_array_with_mode a static function

2014-10-19 Thread Ramsay Jones
On 19/10/14 03:03, Jeff King wrote: > On Sun, Oct 19, 2014 at 12:19:07AM +0100, Ramsay Jones wrote: > [snip] > I actually wondered while writing this series whether anyone actually > _uses_ the mode in object_array (the new code I added sets it to the > appropriate value to be on the safe side,

Re: [PATCH] revision: remove definition of unused 'add_object' function

2014-10-19 Thread Ramsay Jones
On 19/10/14 02:36, Jeff King wrote: > On Sat, Oct 18, 2014 at 10:36:12PM +0100, Ramsay Jones wrote: > >> I noticed that your 'jk/prune-mtime' branch removes the last caller >> of the add_object() function; specifically commit 5f78a431a >> ("reachable: use traverse_commit_list instead of custom wal

Re: git-svn performance

2014-10-19 Thread Fabian Schmied
On Sun, Oct 19, 2014 at 2:32 AM, Eric Wong wrote: > Fabian Schmied wrote: >> Hi, >> >> I'm currently migrating an SVN repository to Git using git-svn (Git >> for Windows 1.8.3-preview20130601), and I'm experiencing severe >> performance problems with "git svn fetch". Commits to the SVN "trunk" >>