Re: Re: [RFC/WIP PATCH] implement reading of submodule .gitmodules configuration into cache

2013-12-12 Thread Heiko Voigt
On Mon, Dec 09, 2013 at 03:37:50PM -0800, Junio C Hamano wrote: +void submodule_config_cache_free(struct submodule_config_cache *cache) +{ + /* NOTE: its important to iterate over the name hash here +* since paths might have multiple entries */ Style (multi-line comments). Will

Re: Re: Publishing filtered branch repositories - workflow / recommendations?

2013-12-12 Thread Heiko Voigt
On Wed, Dec 11, 2013 at 03:16:24PM -0800, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: I think this is closely related to Martin's list of wishes we earlier saw in the thread: remind the user to push necessary submodule tip before the top-level commit that needs that

Re: I have end-of-lifed cvsps

2013-12-12 Thread Martin Langhoff
On Wed, Dec 11, 2013 at 11:26 PM, Eric S. Raymond e...@thyrsus.com wrote: You'll have to remind me what you mean by incremental here. Possibly it's something cvs-fast-export could support. User can - run a cvs to git import at time T, resulting in repo G - make commits to cvs repo - run cvs

Re: I have end-of-lifed cvsps

2013-12-12 Thread Andreas Krey
On Thu, 12 Dec 2013 08:42:25 +, Martin Langhoff wrote: ... - run a cvs to git import at time T, resulting in repo G - make commits to cvs repo - run cvs to git import at time T1, pointed to G, and the import tool will only add the new commits found in cvs between T and T1. I'm pretty

Re: I have end-of-lifed cvsps

2013-12-12 Thread Martin Langhoff
On Thu, Dec 12, 2013 at 12:17 PM, Andreas Krey a.k...@gmx.de wrote: But anyway, the replacement question is a) how fast the cvs-fast-export is and b) whether its output is stable In my prior work, the better CVS importers would not have stable output, so were not appropriate for incremental

Re: I have end-of-lifed cvsps

2013-12-12 Thread Eric S. Raymond
Martin Langhoff martin.langh...@gmail.com: In my prior work, the better CVS importers would not have stable output, so were not appropriate for incremental imports. That is disturbing. I would consider lack of stability a severe and unacceptable failure mode in such a tool, if only because of

Re: I have end-of-lifed cvsps

2013-12-12 Thread Martin Langhoff
On Thu, Dec 12, 2013 at 1:15 PM, Eric S. Raymond e...@thyrsus.com wrote: That terminology -- flying fish and dovetail -- is interesting, and I have not heard it before. It might be woth putting in the Jargon File. Can you point me at examples of live usage? The canonical reference would be

Re: git-submodule.sh respects submodule.$name.update in .git/config but not .gitmodules

2013-12-12 Thread Jens Lehmann
Am 12.12.2013 02:16, schrieb Junio C Hamano: W. Trevor King wk...@tremily.us writes: For safety, maybe the default `init` should copy *everything* into .git/config, after which users can remove stuff they'd like to delegate to .gitmodules. Copying everything into config is be unsafe and

Re: I have end-of-lifed cvsps

2013-12-12 Thread Martin Langhoff
On Thu, Dec 12, 2013 at 1:29 PM, Eric S. Raymond e...@thyrsus.com wrote: I am almost certain the output of cvs-fast-export is stable. I believe the output of cvsps-3.x was, too. Not sure about 2.x. IIRC, making the output stable is nontrivial, specially on branches. Two cases are still in my

Re: git-submodule.sh respects submodule.$name.update in .git/config but not .gitmodules

2013-12-12 Thread W. Trevor King
On Thu, Dec 12, 2013 at 07:57:51PM +0100, Jens Lehmann wrote: Am 12.12.2013 02:16, schrieb Junio C Hamano: I think the solution we want is to copy only minimum to the config (and that minimum may turn out to be nothing), and to default keys that are only absolutely safe to .gitmodules file.

Re: git-submodule.sh respects submodule.$name.update in .git/config but not .gitmodules

2013-12-12 Thread Jonathan Nieder
Jens Lehmann wrote: Am 12.12.2013 02:16, schrieb Junio C Hamano: I think the solution we want is to copy only minimum to the config (and that minimum may turn out to be nothing), and to default keys that are only absolutely safe to .gitmodules file. I agree and will prepare a patch for

Re: Subtree: My Status

2013-12-12 Thread Junio C Hamano
Adam Spiers g...@adamspiers.org writes: On Mon, Apr 22, 2013 at 09:18:46AM +0200, Jeremy Rosen wrote: David Green wrote: Please remember that I don't consider myself a gatekeeper to git subtree. In fact I could use some help reviewing and approving patches. If anyone thinks a patch

Re: I have end-of-lifed cvsps

2013-12-12 Thread Eric S. Raymond
Martin Langhoff martin.langh...@gmail.com: IIRC, making the output stable is nontrivial, specially on branches. Two cases are still in my mind, from when I was wrestling with cvsps. 1 - For a history with CVS HEAD and a long-running stable release branch (STABLE), which branched at P1...

Re: [PATCH v4 2/2] diff: don't read index when --no-index is given

2013-12-12 Thread Junio C Hamano
Thomas Gummerer t.gumme...@gmail.com writes: git diff --no-index ... currently reads the index, during setup, when calling gitmodules_config(). This results in worse performance when the index is not actually needed. This patch avoids calling gitmodules_config() when the --no-index option

Re: I have end-of-lifed cvsps

2013-12-12 Thread Eric S. Raymond
Martin Langhoff martin.langh...@gmail.com: If someone creates a nonsensical tag or branch point, tagging files from different commits, how do you handle it? - without commit ids, does it affect your guesses? No. Tagging is never used to deduce changesets. Look: /* * The heart of the

Re: git-submodule.sh respects submodule.$name.update in .git/config but not .gitmodules

2013-12-12 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 12.12.2013 02:16, schrieb Junio C Hamano: W. Trevor King wk...@tremily.us writes: For safety, maybe the default `init` should copy *everything* into .git/config, after which users can remove stuff they'd like to delegate to .gitmodules.

Re: [PATCH v7 0/4] Show extra branch refs in gitweb

2013-12-12 Thread Junio C Hamano
Krzesimir Nowak krzesi...@endocode.com writes: First patch splits some code to a function. Second patch fixes validation functions to return either 0 or 1, instead of undef or passed $input. Third patch adds the extra-branch-feature and some documentation. Fourth patch adds some visual

Re: I have end-of-lifed cvsps

2013-12-12 Thread Martin Langhoff
On Thu, Dec 12, 2013 at 3:58 PM, Eric S. Raymond e...@thyrsus.com wrote: - regardless of commit ids, do you synthesize an artificial commit? How do you define parenthood for that artificial commit? Because tagging is never used to deduce changesets, the case does not arise. So if a branch

Re: I have end-of-lifed cvsps

2013-12-12 Thread Eric S. Raymond
Martin Langhoff martin.langh...@gmail.com: On Thu, Dec 12, 2013 at 3:58 PM, Eric S. Raymond e...@thyrsus.com wrote: - regardless of commit ids, do you synthesize an artificial commit? How do you define parenthood for that artificial commit? Because tagging is never used to deduce

[PATCH] send-pack.c: mark a file-local function static

2013-12-12 Thread Ramsay Jones
Commit f2c681cf (send-pack: support pushing from a shallow clone via http, 05-12-2013) adds the 'advertise_shallow_grafts_buf' function as an external symbol. This symbol does not require more than file visibility. Noticed by sparse. ('advertise_shallow_grafts_buf' was not declared. Should it be

Re: [PATCH] send-pack.c: mark a file-local function static

2013-12-12 Thread Duy Nguyen
On Fri, Dec 13, 2013 at 6:15 AM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: BTW, I have not been following these patches, but I noticed that the 'remove_nonexistent_ours_in_pack()' function has no callers. (There are two commented out callers - but they seem to have *always* been commented

Re: What's cooking in git.git (Dec 2013, #03; Thu, 12)

2013-12-12 Thread Duy Nguyen
On Fri, Dec 13, 2013 at 7:57 AM, Junio C Hamano gits...@pobox.com wrote: * nd/negative-pathspec (2013-12-06) 3 commits (merged to 'next' on 2013-12-12 at 9f340c8) + pathspec.c: support adding prefix magic to a pathspec with mnemonic magic + Support pathspec magic :(exclude) and its short

Re: I have end-of-lifed cvsps

2013-12-12 Thread Martin Langhoff
On Thu, Dec 12, 2013 at 6:04 PM, Eric S. Raymond e...@thyrsus.com wrote: I'm not sure what counts as a nonsensical branching point. I do know that Keith left this rather cryptic note in a REAME: Keith names exactly what we are talking about. At that time, Keith was struggling with the old xorg

Re: I have end-of-lifed cvsps

2013-12-12 Thread Eric S. Raymond
Martin Langhoff martin.langh...@gmail.com: On Thu, Dec 12, 2013 at 6:04 PM, Eric S. Raymond e...@thyrsus.com wrote: I'm not sure what counts as a nonsensical branching point. I do know that Keith left this rather cryptic note in a REAME: Keith names exactly what we are talking about. Oh,

Re: What's cooking in git.git (Dec 2013, #03; Thu, 12)

2013-12-12 Thread Torsten Bögershausen
On 12/13/2013 01:57 AM, Junio C Hamano wrote: [Cooking] * fc/transport-helper-fixes (2013-12-09) 6 commits - remote-bzr: support the new 'force' option - test-hg.sh: tests are now expected to pass - transport-helper: check for 'forced update' message - transport-helper: add 'force' to