Re: [PATCH] Enable parallelism in git submodule update.

2012-11-03 Thread Jens Lehmann
Am 30.10.2012 19:11, schrieb Stefan Zager: > This is a refresh of a conversation from a couple of months ago. > > I didn't try to implement all the desired features (e.g., smart logic > for passing a -j parameter to recursive submodule invocations), but I > did address the one issue that Junio ins

Re: [PATCH] Enable parallelism in git submodule update.

2012-11-03 Thread Jens Lehmann
Am 29.07.2012 17:37, schrieb Jens Lehmann: > Am 27.07.2012 20:37, schrieb Stefan Zager: >> The --jobs parameter may be used to set the degree of per-submodule >> parallel execution. > > I think this is a sound idea, but it would be good to see some > actual measurements.

Re: [PATCH] Enable parallelism in git submodule update.

2012-11-03 Thread Jens Lehmann
Am 03.11.2012 19:44, schrieb Phil Hord: > On Sat, Nov 3, 2012 at 11:42 AM, Jens Lehmann wrote: >> Am 30.10.2012 19:11, schrieb Stefan Zager: >>> This is a refresh of a conversation from a couple of months ago. >>> >>> I didn't try to implement all the de

Re: [PATCH] Add rm to submodule command.

2012-11-04 Thread Jens Lehmann
Am 04.11.2012 14:43, schrieb Jeff King: > On Fri, Nov 02, 2012 at 10:26:11AM -0700, Alex Linden Levy wrote: > >> This change removes the config entries in .gitmodules and adds it. >> --- > > Signoff? > >> git-submodule.sh | 62 >> +++- >> 1 f

Re: git-archive submodule support

2012-11-04 Thread Jens Lehmann
Am 04.11.2012 15:53, schrieb Rotem Yaari: > I was wondering if there are any plans to support inclusion of > submodules in git-archive. This is very useful for quickly preparing > ready-to-deploy archives of "unstable" branches etc., without the > users' need to clone submodule dependencies each ti

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-07 Thread Jens Lehmann
Am 06.07.2012 08:57, schrieb Junio C Hamano: > Jens Lehmann writes: >> Also apply the same policy as for regular files and >> require forcing when the submodules HEAD is different than what is >> recorded in the index. > > I think the "policy" for regula

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-08 Thread Jens Lehmann
Am 08.07.2012 09:32, schrieb Junio C Hamano: > Jens Lehmann writes: > >>> One possible sane behaviour of "git rm $path" might be: >>> >>> - If --force is given, remove it from the index and from the >>>working tree (i.e. "rm -rf $pa

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-09 Thread Jens Lehmann
Am 09.07.2012 04:17, schrieb Junio C Hamano: > Jens Lehmann writes: > So I still think "--recurse-submodules" does not make any sense to > the "rm" command. I would understand a "Do not attempt to remove > submodules and ignore their existence altogether&quo

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-09 Thread Jens Lehmann
Am 09.07.2012 21:38, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Cool, so let's drop this patch and I'll teach "rm" to handle >> populated submodules according to what we do for regular files: >> Make sure there are no modifications which co

[PATCH] submodules: don't stumble over symbolic links when cloning recursively

2012-07-11 Thread Jens Lehmann
he link from the pwd, which fixes this problem. A test for this problem has been added to t7406. Reported-by: Bob Halley Signed-off-by: Jens Lehmann --- Thanks to Bob for providing a very detailed bug report and test case! git-submodule.sh| 4 ++-- t/t7406-submodule-update.sh |

Re: [PATCH] submodules: don't stumble over symbolic links when cloning recursively

2012-07-11 Thread Jens Lehmann
Am 11.07.2012 21:10, schrieb Johannes Sixt: > Am 11.07.2012 20:11, schrieb Jens Lehmann: >> Since 69c305178 (submodules: refactor computation of relative gitdir path) >> cloning a submodule recursively fails for recursive submodules when a >> symbolic link is part of the pat

Re: [PATCH] submodules: don't stumble over symbolic links when cloning recursively

2012-07-11 Thread Jens Lehmann
Am 11.07.2012 22:39, schrieb Johannes Sixt: > Am 11.07.2012 22:06, schrieb Jens Lehmann: >> Am 11.07.2012 21:10, schrieb Johannes Sixt: >>> Am 11.07.2012 20:11, schrieb Jens Lehmann: >>>> Since 69c305178 (submodules: refactor computation of relative gitdir

[PATCH v2] submodules: don't stumble over symbolic links when cloning recursively

2012-07-12 Thread Jens Lehmann
to_toplevel to remove the link from $PWD, which fixes this problem. A test for this issue has been added to t7406. Reported-by: Bob Halley Signed-off-by: Jens Lehmann --- The changes in this version are: - the SYMLINKS prerequisite is used for the new test - a comment explaining why cd_to_to

Re: [PATCH] Solve git-submodule issues with detached work trees

2012-07-23 Thread Jens Lehmann
Am 23.07.2012 07:09, schrieb Junio C Hamano: > Daniel Graña writes: > >> A common way to track dotfiles with git is using GIT_DIR and >> GIT_WORK_TREE to move repository out of ~/.git with something like: >> >> git init --bare ~/.dotfiles >> alias dotfiles="GIT_DIR=~/.dotfiles GIT_WORK_TR

Re: [PATCH] Solve git-submodule issues with detached work trees

2012-07-23 Thread Jens Lehmann
Am 23.07.2012 20:21, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 23.07.2012 07:09, schrieb Junio C Hamano: >>> Daniel Graña writes: >>> >>>> A common way to track dotfiles with git is using GIT_DIR and >>>> GIT_WORK_TRE

Re: [PATCH] Solve git-submodule issues with detached work trees

2012-07-23 Thread Jens Lehmann
Am 23.07.2012 22:34, schrieb Junio C Hamano: > Jens Lehmann writes: > >> We could get rid of the core.worktree setting by assuming that the >> directory a gitfile was found in is the root of the repo's work >> tree (unless configured otherwise). > > Now you

Re: Bug: Recursive submodules fail when the repo path contains spaces

2012-07-24 Thread Jens Lehmann
Am 24.07.2012 21:01, schrieb Justin Spahr-Summers: > This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33) and > 1.7.11.3. > > Steps: > 1. Create or clone a repository to an absolute path that contains spaces. > 2. Add a submodule to the repository, if it does not already have

Re: [PATCH] Make 'git submodule update --force' always check out submodules.

2012-07-25 Thread Jens Lehmann
Am 25.07.2012 20:44, schrieb Junio C Hamano: > Stefan Zager writes: > >> Currently, it will only do a checkout if the sha1 registered in the >> containing >> repository doesn't match the HEAD of the submodule, regardless of whether the >> submodule is dirty. As discussed on the mailing list, th

Re: [PATCH] cleanup argument passing in submodule status command

2012-07-29 Thread Jens Lehmann
Am 29.07.2012 08:22, schrieb Junio C Hamano: > Heiko Voigt writes: > >> Note: This is a code cleanup and does not fix any bugs. As a side effect >> the variables containing the parsed flags to "git submodule status" are >> passed down recursively. So everything was already behaving as expected. >

Re: [PATCH] Enable parallelism in git submodule update.

2012-07-29 Thread Jens Lehmann
Am 27.07.2012 20:37, schrieb Stefan Zager: > The --jobs parameter may be used to set the degree of per-submodule > parallel execution. I think this is a sound idea, but it would be good to see some actual measurements. What are the performance numbers with and without this change? Which cases do b

Re: The GitTogether

2012-07-29 Thread Jens Lehmann
Am 27.07.2012 13:45, schrieb Thomas Rast: > Scott Chacon writes: > >> GitHub would like to volunteer to organize and pay for these events >> this year. I would like to hold the developer-centric one in Berlin >> in early October > > Yay, Berlin! I would be glad to join there; I would probably

Re: Problems with new location of submodule's GIT_DIR

2012-08-17 Thread Jens Lehmann
Am 17.08.2012 17:28, schrieb Daniel Milde: > Hi all, > I have encountered some difficulties with the new location of the > metainformation directory (GIT_DIR) of submodules. > > The change of location happened in 1.7.8: > > * When populating a new submodule directory with "git submodule init", >

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-08-17 Thread Jens Lehmann
Am 16.08.2012 23:56, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 09.07.2012 21:38, schrieb Junio C Hamano: >>> Jens Lehmann writes: >>> >>>> Cool, so let's drop this patch and I'll teach "rm" to handle >>>>

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-08-19 Thread Jens Lehmann
Am 17.08.2012 20:11, schrieb Phil Hord: > On Fri, Aug 17, 2012 at 12:44 PM, Jens Lehmann wrote: >> >> I'm almost there. The only thing left is to check if a nested >> submodule is using a git directory. In that case I expect "rm" to >> fail even when -f

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Jens Lehmann
Am 23.01.2013 09:55, schrieb Duy Nguyen: > On Wed, Jan 23, 2013 at 3:12 PM, Lars Hjemli wrote: >> +NAME >> + >> +git-all - Execute a git command in multiple repositories > > I agree with Junio "git-all" is too generic. +1 >> +static int get_repo_state() >> +{ >> + const char *diffidx[

Re: [PATCH/RFC] Revoke write access to refs and odb after importing another repo's odb

2013-01-23 Thread Jens Lehmann
Am 23.01.2013 18:01, schrieb Junio C Hamano: > Nguyễn Thái Ngọc Duy writes: > >> add_submodule_odb() can be used to import objects from another >> repository temporarily. After this point we don't know which objects >> are ours, which are external. If we create an object that refers to an >> ext

Re: [PATCHv2 5/8] submodule: use parse_config_key when parsing config

2013-01-23 Thread Jens Lehmann
o.fetchrecursesubmodules=bogus checkout > fatal: bad foo.fetchrecursesubmodules argument: bogus > > [after] > $ git -c submodule.foo.fetchrecursesubmodules=bogus checkout > fatal: bad submodule.foo.fetchrecursesubmodules argument: bogus Thanks, that makes lots of sense! Acked-b

Re: [PATCHv2 6/8] submodule: simplify memory handling in config parsing

2013-01-23 Thread Jens Lehmann
the > code (as opposed to sometimes detaching the strbuf, and then > always releasing it) makes it a little more obvious what is > going on. Thanks, this helps until I some day find the time to refactor that code into a more digestible shape ;-) Acked-by: Jens Lehmann > Sign

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Jens Lehmann
Am 28.01.2013 19:51, schrieb Junio C Hamano: > Lars Hjemli writes: > >>> Come to think of it, is there a reason why "for-each-repo" should >>> not be an extention to "submodule foreach"? We can view this as >>> visiting repositories that _could_ be registered as a submodule, in >>> addition to i

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Jens Lehmann
Am 28.01.2013 21:34, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 28.01.2013 19:51, schrieb Junio C Hamano: >>> Lars Hjemli writes: >>> >>>>> Come to think of it, is there a reason why "for-each-repo" should >>>>

[PATCH v3] submodule: add 'deinit' command

2013-02-04 Thread Jens Lehmann
netheless don't fail. Add tests and link the man pages of "git submodule deinit" and "git rm" to assist the user in deciding whether removing or unregistering the submodule is the right thing to do for him. Signed-off-by: Jens Lehmann --- Ok, here is the reroll followi

Re: [New Feature] git-submodule-move - Easily move submodules

2013-02-04 Thread Jens Lehmann
Am 03.02.2013 23:36, schrieb TJ: > I've recently had need to re-arrange more than ten submodules within a > project and discovered there is apparently no easy way to do it. > > Using some suggestions I found on Stack Overflow I eventually figured out the > steps required. Because the steps can b

Re: What's cooking in git.git (Feb 2013, #03; Wed, 6)

2013-02-06 Thread Jens Lehmann
Am 06.02.2013 19:29, schrieb Junio C Hamano: > * jl/submodule-deinit (2013-02-04) 1 commit > - submodule: add 'deinit' command > > There was no Porcelain way to say "I no longer am interested in > this submodule", once you express your interest in a submodule with > "submodule init". "submodu

[PATCH v4] submodule: add 'deinit' command

2013-02-06 Thread Jens Lehmann
netheless don't fail. Add tests and link the man pages of "git submodule deinit" and "git rm" to assist the user in deciding whether removing or unregistering the submodule is the right thing to do for him. Signed-off-by: Jens Lehmann --- Changes since v3: - Add

Re: will git provide `submodule remove` option ?‏

2013-02-06 Thread Jens Lehmann
Am 05.02.2013 11:32, schrieb Lingcha X: > As we all know, git provides `submodule add , init, update, sync, sumary, > foreach, status`, but where is `submodule remove`? > > will > I not delete one of them sometime in the future? Although most people > will not use submodule or one who uses it c

Re: `git checkout --orpan` leaves a dirty worktree

2013-02-10 Thread Jens Lehmann
Am 08.02.2013 21:17, schrieb Junio C Hamano: > Ramkumar Ramachandra writes: > >> BTW, Is there a better way to clean out the worktree than `git rm -rf >> .`, since that fails for submodules? The impulsive `reset --hard` >> obviously fails because there is no HEAD. > > I _think_ the "git rm" is

Re: [PATCH v4] submodule: add 'deinit' command

2013-02-13 Thread Jens Lehmann
Am 12.02.2013 18:11, schrieb Phil Hord: > On Wed, Feb 6, 2013 at 4:11 PM, Jens Lehmann wrote: > + die_if_unmatched "$mode" >> + name=$(module_name "$sm_path") || exit >> + url=$(git config submodule."$nam

[PATCH v5] submodule: add 'deinit' command

2013-02-17 Thread Jens Lehmann
netheless don't fail. Add tests and link the man pages of "git submodule deinit" and "git rm" to assist the user in deciding whether removing or unregistering the submodule is the right thing to do for him. Also add the deinit subcommand to the completion list. Signed-off-by

Re: [PATCH v5] submodule: add 'deinit' command

2013-02-18 Thread Jens Lehmann
Am 17.02.2013 23:32, schrieb Junio C Hamano: > Jens Lehmann writes: >> diff --git a/git-submodule.sh b/git-submodule.sh >> index 004c034..0fb6ee0 100755 >> --- a/git-submodule.sh >> +++ b/git-submodule.sh >> @@ -547,6 +548,82 @@ cmd_init() >> } >>

Re: Recursive submodule confusing output (bug?)

2013-02-18 Thread Jens Lehmann
Am 18.02.2013 16:58, schrieb Will Entriken: > I am running: > > git submodule update --recursive > > And get the output: > > Submodule path 'Submodules/evernote-ios-sdk': checked out > '391ca643c5b1cd02e9fa869a6b0760436ea452ed' > Submodule path 'Submodules/facebook-ios-sdk': checked

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jens Lehmann
Am 18.02.2013 20:45, schrieb Thomas Rast: > Ramkumar Ramachandra writes: >> What's the harm of including something estimated to take 80% of a >> summer? > > Maybe even less than 80%. I didn't regret at all having split the summer's topic I mentored into smaller pieces. That made it easy to post

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jens Lehmann
Am 18.02.2013 20:34, schrieb Jonathan Nieder: > That said, I won't have time to mentor a project on my own. It takes > a lot of time (or luck, to get the student that doesn't need > mentoring). That's my experience too. Also I think it really makes sense to have a co-mentor so you can balance the

Re: [PATCH] submodule update: when using recursion, show full path

2013-02-22 Thread Jens Lehmann
Thanks. Your code changes are looking good and the commit message explains what you did and why you did it. A few comments below. Am 22.02.2013 05:25, schrieb Will Entriken: >>From d3fe2c76e6fa53e4cfa6f81600685c21bdadd4e3 Mon Sep 17 00:00:00 2001 > From: William Entriken > Date: Thu, 21 Feb 2013

Re: state of the art with moving submodules

2013-02-26 Thread Jens Lehmann
Am 26.02.2013 09:09, schrieb Chris Packham: > At $dayjob we were discussing a potential re-org of our super-projects > to introduce a bit of hierarchy to the submodules (at the moment it's > fairly flat). One downside of this is the potential loss of locally > committed work. There is also a cost i

Re: gc does not clean up after itself when not enough disk space

2013-02-26 Thread Jens Lehmann
Am 26.02.2013 17:07, schrieb Junio C Hamano: > "jones.noamle" writes: > >> # git gc >> Counting objects: 44626, done. >> Delta compression using up to 8 threads. >> Compressing objects: 100% (7756/7756), done. >> fatal: sha1 file '.git/objects/pack/tmp_pack_uJ0E5b' write error: No >> space left o

Re: Adding "--ignore-submodules" switch to git-describe

2013-03-01 Thread Jens Lehmann
Am 01.03.2013 18:46, schrieb Junio C Hamano: > I think what is missing from "--dirty" is not "--ignore-submodules", > but "--do-not-ignore-untracked" option [*1*]. "describe --dirty" > ignores untracked files in the superproject by default, and we > should ignore untracked files in submodule worki

Re: [PATCH] submodule update: when using recursion, show full path

2013-03-03 Thread Jens Lehmann
> > Signed-off-by: William Entriken Thanks, this patch cleanly applies against maint and addresses all issues from the previous rounds. Acked-by: Jens Lehmann Junio, could you please squash in this additional test? 8<--- diff --git a/t/t7406-submodule-update.sh b/t/t740

[PATCH v6] submodule: add 'deinit' command

2013-03-04 Thread Jens Lehmann
s are found in .git/config. Add tests and link the man pages of "git submodule deinit" and "git rm" to assist the user in deciding whether removing or unregistering the submodule is the right thing to do for him. Also add the deinit subcommand to the completion list. Signed

Re: [PATCH/RFC] Changing submodule foreach --recursive to be depth-first, --parent option to execute command in supermodule as well

2013-03-04 Thread Jens Lehmann
Please don't attach your patches, see Documentation/SubmittingPatches on how to post patches to this list. Am 04.03.2013 09:41, schrieb Eric Cousineau: > In this patch, foreach --recursive acts depth-first, much like the default > behavior described in the patch by Imram Yousuf in this > post

Re: [PATCH/RFC] Changing submodule foreach --recursive to be depth-first, --parent option to execute command in supermodule as well

2013-03-05 Thread Jens Lehmann
Am 05.03.2013 19:34, schrieb Junio C Hamano: > Eric Cousineau writes: > >> Would these be the correct behaviors of Heiko's implementation? > > I do not think Heiko already has an implementation, but let's try to > see how each example makes sense. > >> git submodule foreach # Empty command, pre

Re: Merging submodules - best merge-base

2013-03-09 Thread Jens Lehmann
Am 07.03.2013 19:59, schrieb Heiko Voigt: > On Thu, Mar 07, 2013 at 10:49:09AM +0100, Daniel Bratell wrote: >> Den 2013-03-06 19:12:05 skrev Heiko Voigt : >> >>> On Mon, Feb 25, 2013 at 05:44:05PM +0100, Daniel Bratell wrote: A submodule change can be merged, but only if the merge is a "f

Re: [PATCH/RFC] Changing submodule foreach --recursive to be depth-first, --parent option to execute command in supermodule as well

2013-03-09 Thread Jens Lehmann
Am 05.03.2013 22:17, schrieb Phil Hord: > On Tue, Mar 5, 2013 at 3:51 PM, Jens Lehmann wrote: >> Am 05.03.2013 19:34, schrieb Junio C Hamano: >>> Eric Cousineau writes: >>>> ... >>> I am not entirely convinced we would want --include-super in the >>

Re: [PATCH v4] submodule: add 'deinit' command

2013-03-18 Thread Jens Lehmann
Am 12.03.2013 17:22, schrieb Junio C Hamano: > Phil Hord writes: > >> I think this would be clearer if 'git deinit' said >> >> rm 'submodule/*' >> >> or maybe >> >> Removed workdir for 'submodule' >> >> Is it just me? > > The latter may probably be better. Hmm, it doesn't really remov

Re: [PATCH/RFC] Changing submodule foreach --recursive to be depth-first, --parent option to execute command in supermodule as well

2013-03-18 Thread Jens Lehmann
Am 12.03.2013 17:01, schrieb Phil Hord: > On Sat, Mar 9, 2013 at 1:18 PM, Jens Lehmann wrote: >> Am 05.03.2013 22:17, schrieb Phil Hord: >>> On Tue, Mar 5, 2013 at 3:51 PM, Jens Lehmann wrote: >>>> Am 05.03.2013 19:34, schrieb Junio C Hamano: >>>>>

Re: [PATCH/RFC] Changing submodule foreach --recursive to be depth-first, --parent option to execute command in supermodule as well

2013-03-18 Thread Jens Lehmann
Thanks, just a quick review before I find some time do take a deeper look. Am 14.03.2013 07:30, schrieb Eric Cousineau: > From 59fb432e17a1aae9de26bbaaca7f09cc7f03b471 Mon Sep 17 00:00:00 2001 > From: Eric Cousineau > Date: Thu, 14 Mar 2013 01:19:53 -0500 > Subject: [PATCH] submodule-foreach: Add

<    1   2   3   4   5   6