Re: [PATCH 02/15] submodule: don't use submodule_from_name

2017-07-30 Thread Jens Lehmann
Am 26.07.2017 um 23:06 schrieb Junio C Hamano: Stefan Beller writes: Rereading the archives, there was quite some discussion on the design of these patches, but these lines of code did not get any attention https://public-inbox.org/git/4cdb3063.5010...@web.de/ I cc'd Jens in the hope of

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Jens Lehmann
Am 21.07.2016 um 01:22 schrieb Stefan Beller: So maybe we want to drop that series and first talk about a migration plan from the current state to a world where we have the existence depending not on the url parameter, but a boolean variable submodule... Depending on a submodule would be ignored

Re: Subject: [PATCH for submodule ideas wiki] `git commit` to warn about broken submodule states configuration

2016-03-19 Thread Jens Lehmann
Am 16.03.2016 um 22:07 schrieb Stefan Beller: --- Hi Jens, I cannot find the edit button in the wiki[1] any more. Oops. After you mentioned recently that every GitHub user had write permissions to the Wiki I restricted it to be writable for known collaborators and also added you to this

Re: [PATCH] submodule: Fetch the direct sha1 first

2016-02-22 Thread Jens Lehmann
Am 20.02.2016 um 01:11 schrieb Junio C Hamano: Stefan Beller writes: On Fri, Feb 19, 2016 at 2:29 PM, Junio C Hamano wrote: Stefan Beller writes: Doing a 'git fetch' only and not the fetch for the specific sha1 would be incorrect? I thought that was what you are attempting to address.

Re: [RFC/PATCH 0/5] [WAS: Submodule Groups] Labels and submodule.autoInitialize

2016-01-31 Thread Jens Lehmann
Am 26.01.2016 um 22:50 schrieb Stefan Beller: On Tue, Jan 26, 2016 at 12:59 PM, Jens Lehmann wrote: Ok. Though we might wanna call it submodule.autoUpdate, as initializing it is only the prerequisite for automatically updating submodules. And I believe automatically updating is the thing

Re: [RFC/PATCH 0/5] [WAS: Submodule Groups] Labels and submodule.autoInitialize

2016-01-26 Thread Jens Lehmann
Am 25.01.2016 um 19:59 schrieb Stefan Beller: On Sun, Jan 24, 2016 at 11:38 AM, Jens Lehmann wrote: Am 23.01.2016 um 01:31 schrieb Stefan Beller: This series introduces labels which you can attach to submodules like so: $ cat .gitmodules [submodule "gcc"]

Re: [RFC/PATCH 0/5] [WAS: Submodule Groups] Labels and submodule.autoInitialize

2016-01-24 Thread Jens Lehmann
Disclaimer: Due to my currently very limited Git time budget I only glanced over the recent discussion and patches. If you think I missed something already discussed, I'd be happy being pointed to the relevant discussion so I can catch up and avoid wasting everybody's time. Am 23.01.2016 um 01:31

Re: [RFC PATCH 0/5] Submodule Groups

2015-12-01 Thread Jens Lehmann
Am 01.12.2015 um 00:54 schrieb Stefan Beller: On Wed, Nov 25, 2015 at 11:18 AM, Jens Lehmann wrote: Hmm, I doubt it makes much sense to add the --group option to "git submodule init". I'd rather init all submodules and do the group handling only in the "git submodule updat

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 21:03 schrieb Stefan Beller: On Wed, Nov 25, 2015 at 11:50 AM, Jens Lehmann wrote: My thinking is that groups are implying recursive, whereas recursive implies "all groups", so a git clone --group --recursive makes not much sense to me as it begs the question,

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 19:08 schrieb Stefan Beller: On Wed, Nov 25, 2015 at 9:52 AM, Jens Lehmann wrote: +--group:: + After the clone is created, all submodules which are part of the + group are cloned. This option can be given multiple times to specify + different groups. Ah

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-25 Thread Jens Lehmann
(Sorry for the resend of my last mail, but I received bounce messages from my email provider) Am 25.11.2015 um 19:00 schrieb Stefan Beller: --cc Johannes Sixt On Wed, Nov 25, 2015 at 9:35 AM, Jens Lehmann wrote: [submodule "gcc"] path = gcc

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 02:32 schrieb Stefan Beller: This is also available at https://github.com/stefanbeller/git/tree/submodule-groups It applies on top of the submodule-parallel-patch series I sent a few minutes ago. Consider having a real large software project in Git with each component in a sub

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 02:32 schrieb Stefan Beller: This passes each group to the `submodule update` invocation and additionally configures the groups to be automatically updated. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 11 builtin/clone.c | 33 +

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 02:32 schrieb Stefan Beller: This is also available at https://github.com/stefanbeller/git/tree/submodule-groups It applies on top of the submodule-parallel-patch series I sent a few minutes ago. Consider having a real large software project in Git with each component in a sub

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-17 Thread Jens Lehmann
Am 17.11.2015 um 21:49 schrieb Stefan Beller: I assumed we'd have yet another flag to activate the new behavior, but if you want to roll out that new feature as a default, I agree on needing the fallback. Ah, I was under the impression that users are surprised by --depth not propagating into th

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-17 Thread Jens Lehmann
Am 17.11.2015 um 21:04 schrieb Stefan Beller: On Tue, Nov 17, 2015 at 11:46 AM, Jens Lehmann wrote: But for quite some time you'll have older servers out there that don't support fetching a single sha1 or aren't configured to do so. Only when talking about the open source si

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-17 Thread Jens Lehmann
Am 16.11.2015 um 23:56 schrieb Stefan Beller: On Mon, Nov 16, 2015 at 1:42 PM, Jens Lehmann wrote: Am 16.11.2015 um 20:25 schrieb Stefan Beller: On Mon, Nov 16, 2015 at 10:59 AM, Jens Lehmann wrote: Am 14.11.2015 um 01:10 schrieb Stefan Beller: Thanks for pointing out that we already

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-16 Thread Jens Lehmann
Am 16.11.2015 um 20:25 schrieb Stefan Beller: On Mon, Nov 16, 2015 at 10:59 AM, Jens Lehmann wrote: Am 14.11.2015 um 01:10 schrieb Stefan Beller: Thanks for pointing out that we already have some kind of server support. I wonder if we should add an additional way to make fetching only some

Re: [PATCH] push: add recurseSubmodules config option

2015-11-16 Thread Jens Lehmann
Am 16.11.2015 um 19:31 schrieb Mike Crowe: On Monday 16 November 2015 at 10:15:24 -0800, Stefan Beller wrote: The code itself looks good to me, one nit in the tests though. @@ -79,6 +87,119 @@ test_expect_success 'push succeeds after commit was pushed to remote' ' ) ' +test_expect

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-16 Thread Jens Lehmann
Am 14.11.2015 um 01:10 schrieb Stefan Beller: On Fri, Nov 13, 2015 at 3:41 PM, Jeff King wrote: On Fri, Nov 13, 2015 at 06:38:07PM -0500, Jeff King wrote: On Fri, Nov 13, 2015 at 03:16:01PM -0800, Stefan Beller wrote: Junio wrote on Oct 09, 2014: This is so non-standard a thing to do that

Re: [PATCHv3 08/11] fetching submodules: respect `submodule.jobs` config option

2015-11-13 Thread Jens Lehmann
Am 12.11.2015 um 00:34 schrieb Stefan Beller: On Wed, Nov 11, 2015 at 11:55 AM, Jens Lehmann wrote: TL;DR: checkout is serial, network-related stuff only will be using submodule.jobs My point being: isn't "jobs" a bit too generic for a config option that is only relev

Re: git submodule sync / git submodule rm

2015-11-11 Thread Jens Lehmann
Am 11.11.2015 um 11:18 schrieb Boettger, Heiko: i'm currently on a migration from svn to git and also have the task to convert the svnexternal to git submodules. During the migration step I am doing an automatic verification which needs a reliable way to switch the working tree to another bran

Re: [PATCHv3 08/11] fetching submodules: respect `submodule.jobs` config option

2015-11-11 Thread Jens Lehmann
Am 10.11.2015 um 23:29 schrieb Stefan Beller: On Tue, Nov 10, 2015 at 2:21 PM, Jens Lehmann wrote: +submodule.jobs:: + This is used to determine how many submodules can be operated on in + parallel. Specifying a positive integer allows up to that number + of submodules being

Re: Allow git alias to override existing Git commands

2015-11-11 Thread Jens Lehmann
Am 10.11.2015 um 23:49 schrieb Stefan Beller: On Tue, Nov 10, 2015 at 1:57 PM, Jens Lehmann wrote: Am 10.11.2015 um 19:12 schrieb Stefan Beller: On Tue, Nov 10, 2015 at 8:31 AM, Jeremy Morton For example, I wanted to setup "git clone" to automatically act as "git clone --recu

Re: [PATCHv3 08/11] fetching submodules: respect `submodule.jobs` config option

2015-11-10 Thread Jens Lehmann
Am 04.11.2015 um 01:37 schrieb Stefan Beller: This allows to configure fetching and updating in parallel without having the command line option. This moved the responsibility to determine how many parallel processes to start from builtin/fetch to submodule.c as we need a way to communicate "The

Re: Allow git alias to override existing Git commands

2015-11-10 Thread Jens Lehmann
Am 10.11.2015 um 19:12 schrieb Stefan Beller: On Tue, Nov 10, 2015 at 8:31 AM, Jeremy Morton wrote: It's recently come to my attention that the "git alias" config functionality ignores all aliases that would override existing Git commands. This seems like a bad idea to me. This ensures that

Re: Why are submodules not automatically handled by default or at least configurable to do so?

2015-10-26 Thread Jens Lehmann
Am 26.10.2015 um 05:48 schrieb Nazri Ramliy: On Mon, Oct 26, 2015 at 7:10 AM, John Smith wrote: When would people routinely check out a branch and want to stay with the submodules as the have been checked out for the old branch? I do this a lot. At my $dayjob we have a super project with bun

Re: [RFC] URL rewrite in .gitmodules

2015-10-26 Thread Jens Lehmann
Am 26.10.2015 um 17:34 schrieb Stefan Beller: On Sun, Oct 25, 2015 at 8:12 AM, Lars Schneider wrote: On 20 Oct 2015, at 19:33, Junio C Hamano wrote: I do not think this topic is specific to use of submodules. If you want to encourage your engineers to fetch from nearby mirrors you maintain,

Re: Clarification on Submodule/Subproject naming

2015-10-07 Thread Jens Lehmann
Am 07.10.2015 um 00:00 schrieb Stefan Beller: So a discussing started in a Gerrit change [1] if we want to name it submodule or subproject. We decided to stick with the git core convention of naming it subproject for now. What convention? Isn't diff output the only place where we talk about sub

Re: git submodule ignores --git-dir

2015-09-11 Thread Jens Lehmann
Am 10.09.2015 um 22:06 schrieb Filip Gospodinov: Hi! I use the `--git-dir` flag in some scripts such that I don't need to `cd` back and forth. Recently, I've discovered that `--git-dir` does not seem to work correctly for `git submodule`. Here is a short snippet to reproduce that behavior: mkd

Re: [PATCH/RFC] Pinning of submodules

2015-09-07 Thread Jens Lehmann
Am 07.09.2015 um 01:43 schrieb Eric Sunshine: On Sun, Sep 6, 2015 at 6:08 PM, Anders Ro wrote: On 04/09/15 07:02, Eric Sunshine wrote: On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro wrote: git-submodule.sh: pin submodule when branch name is '@' Setting branch name to '@' for a submodule will dis

Re: [RFC/PATCH 0/4] parallel fetch for submodules

2015-08-06 Thread Jens Lehmann
Am 06.08.2015 um 19:35 schrieb Stefan Beller: When I was looking at the branches of Jens for work done on submodules not yet upstream I found a commit "WIP threaded submodule fetching[1], and I was side tracked wanting to present a different approach to that. Cool. I didn't follow that route fu

Re: [PATCH 1/4] submodule: implement `module_name` as a builtin helper

2015-08-06 Thread Jens Lehmann
Am 06.08.2015 um 21:49 schrieb Jens Lehmann: And wouldn't it make more sense to keep this patch together with the "submodule: implement `module_list` as a builtin helper" in its own "submodule-helper" series and have the following three patches in a separate "

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-06 Thread Jens Lehmann
Am 05.08.2015 um 23:08 schrieb Stefan Beller: This implements the helper `module_name` in C instead of shell, yielding a nice performance boost. Before this patch, I measured a time (best out of three): $ time ./t7400-submodule-basic.sh >/dev/null real 0m11.066s user 0

Re: [PATCH 1/4] submodule: implement `module_name` as a builtin helper

2015-08-06 Thread Jens Lehmann
Am 06.08.2015 um 19:35 schrieb Stefan Beller: This implements the helper `module_name` in C instead of shell, yielding a nice performance boost. Before this patch, I measured a time (best out of three): $ time ./t7400-submodule-basic.sh >/dev/null real 0m11.066s user 0

Re: [PATCH 2/4] submodule: implement `module_name` as a builtin helper

2015-08-05 Thread Jens Lehmann
Am 05.08.2015 um 02:04 schrieb Stefan Beller: The goal of this series being rewriting `git submodule update`, we don't want to call out to the shell script for config lookups. So reimplement the lookup of the submodule name in C. Cool. This brings down the duration of the test suite from 3:13

Re: [PATCH 1/4] submodule: implement `module_list` as a builtin helper

2015-08-05 Thread Jens Lehmann
dows users to profit even more, considered how expensive forking is there) Acked-by: Jens Lehmann Signed-off-by: Stefan Beller --- The same as yesterday evening, just an entry added to .gitignore. So we'll have a "git submodule--helper module_list" here. .gitig

Re: [PATCH v5 1/4] implement submodule config API for lookup of .gitmodules values

2015-07-09 Thread Jens Lehmann
Am 09.07.2015 um 17:49 schrieb Jeff King: On Thu, Jul 09, 2015 at 02:09:01PM +0200, Heiko Voigt wrote: Instead of test-submodule-config.c to test this new module, it could be useful to implement these as extensions to rev-parse: git rev-parse --submodule-name [:] git rev-parse --subm

Re: Selectively clone Git submodules -- a useful feature?

2015-06-19 Thread Jens Lehmann
Am 18.06.2015 um 22:55 schrieb Lars Schneider: AFAIK Git has two ways to clone a repository with respect to submodules: (1) Plain clone of just the repository itself: git clone git://github.com/foo/bar.git (2) Recursive clone of the repository including all its submodules: git clone --recursive

Re: Submodules as first class citizens (was Re: Moving to subtrees for plugins?)

2015-06-11 Thread Jens Lehmann
Am 11.06.2015 um 18:11 schrieb Phil Hord: On Tue, Jun 9, 2015 at 2:40 PM, Jens Lehmann wrote: Am 07.06.2015 um 08:26 schrieb Stefan Beller: On 06.06.2015 12:53, Luca Milanesio wrote: On 6 Jun 2015, at 18:49, Phil Hord wrote: On Fri, Jun 5, 2015, 2:58 AM lucamilanesio wrote: Ideally, as

Re: format-patch and submodules

2015-06-09 Thread Jens Lehmann
Am 05.06.2015 um 01:20 schrieb Christopher Dunn: (Seen in git versions: 2.1.0 and 1.9.3 et al.) $ git format-patch --stdout X^..X | git apply check - fatal: unrecognized input This fails when the commit consists of nothing but a submodule change (as in 'git add submodule foo'), but it passes wh

Re: Submodules as first class citizens (was Re: Moving to subtrees for plugins?)

2015-06-09 Thread Jens Lehmann
Am 07.06.2015 um 08:26 schrieb Stefan Beller: On 06.06.2015 12:53, Luca Milanesio wrote: On 6 Jun 2015, at 18:49, Phil Hord wrote: On Fri, Jun 5, 2015, 2:58 AM lucamilanesio wrote: Ideally, as a "git clone --recursive" already exists, I would like to see a "git diff --recursive" that goes thr

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-04 Thread Jens Lehmann
Am 04.05.2015 um 17:05 schrieb Robert Dailey: On Fri, May 1, 2015 at 12:57 PM, Heiko Voigt wrote: Hi, On Wed, Apr 29, 2015 at 03:53:11PM -0500, Robert Dailey wrote: I am attempting to diff a submodule modified in my working copy and the only difference is a merge commit. However, I do not get

Re: Rebasing with submodule change causes red herring with --continue

2015-04-23 Thread Jens Lehmann
Am 23.04.2015 um 21:07 schrieb Robert Dailey: On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey wrote: On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote: On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote: I have a branch that contains a commit with a single change: A submodule po

Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash

2015-04-22 Thread Jens Lehmann
Am 22.04.2015 um 21:58 schrieb Junio C Hamano: Jens Lehmann writes: Am 21.04.2015 um 23:08 schrieb Junio C Hamano: I looked at the test script update. The new test does (I am rephrasing to make it clearer): mkdir -p dir/ectory git init dir/ectory ;# a new directory inside top

Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash

2015-04-22 Thread Jens Lehmann
Am 21.04.2015 um 23:08 schrieb Junio C Hamano: Duy Nguyen writes: On Mon, Apr 20, 2015 at 12:37 PM, Junio C Hamano wrote: Duy Nguyen writes: But if you look at it another way, "cd subrepo; git add ." should be the same as "git add subrepo" ... Once you cd into "subrepo", you are in a di

Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash

2015-04-19 Thread Jens Lehmann
353 (parse_pathspec: accept :(icase)path syntax - 2013-07-14) 2ce53f9 (git add: do not add files from a submodule - 2009-01-02) Noticed-by: djanos_ (via irc) Helped-by: Dennis Kaarsemaker Signed-off-by: Nguyễn Thái Ngọc Duy --- On Fri, Apr 17, 2015 at 2:27 AM, Jens Lehmann wrote: > The probl

Re: assert failed in submodule edge case

2015-04-16 Thread Jens Lehmann
Am 13.04.2015 um 18:55 schrieb Dennis Kaarsemaker: Reported by djanos_ in #git: git add segfaults when you manage to confuse it with a submodule in the index that is no longer a submodule. Here's his script to reproduce the segfault: mkdir segfault cd segfault mkdir subrepo cd subrepo git ini

Re: git-archive ignores submodules

2015-04-16 Thread Jens Lehmann
Am 16.04.2015 um 20:09 schrieb Pedro Rodrigues: Good to know about git submodule foreach. Simpler yet, I'm using: zip -r ../project.zip . -x *.git* Which essentially does the same thing I would need from git-archive --recurse-submodule, zip everything excluding .git folders. Still would be bet

Re: Suggestion: git submodule remove

2015-04-11 Thread Jens Lehmann
Am 10.04.2015 um 13:33 schrieb Konrád Lőrinczi: I really miss the git submodule remove command. This should be handle all the tasks what are needed to remove a submodule. - Delete the relevant line from the .gitmodules file. - Delete the relevant section from .git/config. - Run

Re: Why can't I stash submodule changes?

2015-04-06 Thread Jens Lehmann
Am 06.04.2015 um 04:15 schrieb Shane da Silva: I’m having trouble understanding why I cannot stash changes to a submodule. When adding a submodule to a repository (`git submodule add ./sub-repo`), I can then run `git stash` and `git stash pop` with expected results—the submodule disappears and r

Re: [RFC] git submodule purge

2015-03-26 Thread Jens Lehmann
Am 26.03.2015 um 14:30 schrieb Patrick Steinhardt: On Wed, Mar 25, 2015 at 08:47:59PM +0100, Jens Lehmann wrote: Am 25.03.2015 um 10:06 schrieb Patrick Steinhardt: Optionally I could implement `git gc --purge-submodule=` as a second way to access the feature so that we have a way of purging

Re: per-repository and per-worktree config variables

2015-03-25 Thread Jens Lehmann
Am 18.03.2015 um 22:33 schrieb Max Kirillov: On Sun, Feb 08, 2015 at 09:36:43AM -0800, Jens Lehmann wrote: I wonder if it's worth all the hassle to invent new names. Wouldn't it be much better to just keep a list of per-worktree configuration value names and use that inside the conf

Re: [PATCH, RFC] checkout: Attempt to checkout submodules

2015-03-25 Thread Jens Lehmann
Am 24.03.2015 um 19:30 schrieb Trevor Saunders: On Mon, Mar 23, 2015 at 09:01:48PM +0100, Jens Lehmann wrote: Using -f here is ok when you extend the appropriate verify functions in unpack-trees.c to check that no modifications will be lost (unless the original checkout is used with -f). See

Re: [RFC] git submodule purge

2015-03-25 Thread Jens Lehmann
Am 25.03.2015 um 10:06 schrieb Patrick Steinhardt: On Mon, Mar 23, 2015 at 10:32:27PM +0100, Jens Lehmann wrote: Am 17.03.2015 um 08:56 schrieb Patrick Steinhardt: On Mon, Mar 16, 2015 at 01:03:53PM -0700, Jonathan Nieder wrote: (+cc: Jens and Heiko, submodule experts) Hi, Patrick Steinhardt

Re: [RFC] git submodule purge

2015-03-23 Thread Jens Lehmann
Am 17.03.2015 um 08:56 schrieb Patrick Steinhardt: On Mon, Mar 16, 2015 at 01:03:53PM -0700, Jonathan Nieder wrote: (+cc: Jens and Heiko, submodule experts) Hi, Patrick Steinhardt wrote: This proposal is just for discussion. If there is any interest I will implement the feature and send some

Re: [PATCH, RFC] checkout: Attempt to checkout submodules

2015-03-23 Thread Jens Lehmann
Am 20.03.2015 um 01:13 schrieb Trevor Saunders: On Thu, Mar 19, 2015 at 02:15:19PM -0700, Junio C Hamano wrote: Trevor Saunders writes: I have a feeling that an optional feature that allows "git submodule update" to happen automatically from this codepath might be acceptable by the submodule fo

Re: Bug? git submodule add SSL certificate problem: unable to get local issuer certificate

2015-03-10 Thread Jens Lehmann
Am 09.03.2015 um 20:43 schrieb Jeff King: On Thu, Mar 05, 2015 at 04:20:10PM +0100, Aschemann Gerd wrote: seems to be a bug: If adding a submodule from an https URL with a certificate issued by StartSSL (or even a private/self-signed one?) leads to the following error: $ git -c http.sslve

Re: [PATCH 0/3] nd/multiple-work-trees updates

2015-02-12 Thread Jens Lehmann
Am 13.02.2015 um 11:57 schrieb Junio C Hamano: Nguyễn Thái Ngọc Duy writes: These patches are on top of what's in 'pu'. They add --ignore-other-worktrees and make a note about current submodule support status. I don't think submodule support is ready yet even with Max Kirillov's series [1]. H

Re: [PATCH/RFD 0/3] worktree.* config keys and submodule and multiple worktrees

2015-02-08 Thread Jens Lehmann
Am 08.02.2015 um 09:36 schrieb Jens Lehmann: Am 08.02.2015 um 05:16 schrieb Nguyễn Thái Ngọc Duy: 1/3 is a more complete version of a patch I posted earlier [1]. It makes sure that worktree.* config keys are stored in a different place than $GIT_DIR/config. This allows us to work around the

Re: [PATCH/RFD 0/3] worktree.* config keys and submodule and multiple worktrees

2015-02-08 Thread Jens Lehmann
Am 08.02.2015 um 05:16 schrieb Nguyễn Thái Ngọc Duy: 1/3 is a more complete version of a patch I posted earlier [1]. It makes sure that worktree.* config keys are stored in a different place than $GIT_DIR/config. This allows us to work around the core.worktree issue in multiple worktree setting.

Re: [PATCH] git-submodules.sh: fix '/././' path normalization

2015-02-02 Thread Jens Lehmann
Am 30.01.2015 um 16:14 schrieb Patrick Steinhardt: When we add a new submodule the path of the submodule is being normalized. We fail to normalize multiple adjacent '/./', though. Thus 'path/to/././submodule' will become 'path/to/./submodule' where it should be 'path/to/submodule' instead. Than

Re: [PATCH] git-new-workdir: support submodules

2015-01-27 Thread Jens Lehmann
Am 26.01.2015 um 06:39 schrieb Junio C Hamano: Craig Silverstein writes: This patch, in adding submodule support, I expect would be similarly useful to people even though it, also, imposes those same constraints to the submodule's config files. I would expect that you would see exactly the s

Re: git --recurse-submodule does not recurse to sub-submodules (etc.)

2015-01-20 Thread Jens Lehmann
Am 19.01.2015 um 21:19 schrieb Maximilian Held: I have a directory with nested submodules, such as: supermodule/submodule/sub-submodule/sub-sub-submodule When I cd to supermodule and do: "git push --recurse-submodule=check" (or on-demand), git only pushes the submodule, but not the sub-submod

Re: [PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Jens Lehmann
Am 07.01.2015 um 01:02 schrieb Junio C Hamano: ^"Kyle J. McKay" writes: I can't find anything in that thread about why vsatisfies was preferred over vcompare other than the obvious that the vsatisfies version is only a 1-character change. And that would be more than enough except that Tcl 8.4

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-08 Thread Jens Lehmann
Am 07.12.2014 um 07:42 schrieb Max Kirillov: On Sat, Dec 06, 2014 at 02:06:08PM +0100, Jens Lehmann wrote: Am 05.12.2014 um 07:32 schrieb Max Kirillov: Currently I'm estimating approach when submodules which have .git file or directory inside are updated, and those which do not have it ar

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Jens Lehmann
Am 05.12.2014 um 07:32 schrieb Max Kirillov: On Thu, Dec 4, 2014 at 10:06 PM, Jens Lehmann wrote: But I'd need to have separate settings for our CI server, e.g. to checkout the sources without the largish documentation submodule in one test job (=worktree) while checking out the

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Jens Lehmann
Am 05.12.2014 um 02:33 schrieb Duy Nguyen: On Fri, Dec 5, 2014 at 3:06 AM, Jens Lehmann wrote: Wow, so the .git/config is shared between all worktrees? I suspect you have very good reasons for that, most of config vars are at repo-level, not worktree-level, except maybe submodule.* and

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-04 Thread Jens Lehmann
Am 02.12.2014 um 23:16 schrieb Max Kirillov: On Tue, Dec 02, 2014 at 09:45:24PM +0100, Jens Lehmann wrote: But, while hacking the submodule init I became more convinced that the modules directory should be common and submodules in checkout should be a checkouts of the submodule. Because this is

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-02 Thread Jens Lehmann
Am 01.12.2014 um 00:27 schrieb Max Kirillov: builtin/checkout.c: use absolute path instead of given argument for picking worktree name, it happens to be needed because for submodule checkout the new worktree is always "." environment.c: add GIT_COMMON_DIR to local_repo_env git-submodule.sh: i

Re: Force git submodule update --remote for some branches

2014-11-30 Thread Jens Lehmann
Am 28.11.2014 um 18:54 schrieb Timothy M. Redaelli: I have a repository with a submodule and I'd like to force git to checkout the LAST version of the submodule and not the stored one (like git submodule update --remote), but only on some branches and without the need to remember to add --remote

Re: [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules

2014-11-09 Thread Jens Lehmann
Am 07.11.2014 um 20:20 schrieb Junio C Hamano: Johannes Schindelin writes: They are not affected by the update anyway. Signed-off-by: Johannes Schindelin --- builtin/receive-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/receive-pack.c b/builtin/receive

Re: Feedback on submitting patches / here submodule

2014-11-09 Thread Jens Lehmann
Am 09.11.2014 um 12:39 schrieb Tom Freudenberg: Hi, a few weeks ago I send out attached message and patch to gitster-at-pobox.com tried to follow the guidelines. Have not get any feedback until now, neither acceptance nor decline … just no feedback. I am not sure if the message was received or

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-04 Thread Jens Lehmann
Am 04.11.2014 um 00:08 schrieb Junio C Hamano: Michal Sojka writes: Or something perhaps? Or the detailed description of submodule.$name.update should be dropped from here and refer the reader to config.txt instead? I guess you mean gitmodules.txt. Actually, I do mean the configuration. .

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Jens Lehmann
Am 03.11.2014 um 21:53 schrieb Junio C Hamano: I did a bit more digging of the history, and came up with this, which would be with a clearer and fairer description. Also to clarify, I spelled what Michal's "This" meant to refer to. -- >8 -- From: Michal Sojka Date: Mon, 3 Nov 2014 11:09:51 +01

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

2014-11-03 Thread Jens Lehmann
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 in the repository "checkout --

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Jens Lehmann
Am 03.11.2014 um 20:02 schrieb Junio C Hamano: Michal Sojka writes: The documentation says that submodule.$name.update can be overridden by --checkout only if its value is `none`. This is not true, because both implementation and documentation of --checkout specifies that the override applies

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 n

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

2014-10-15 Thread Jens Lehmann
Am 15.10.2014 um 00:15 schrieb Max Kirillov: On Tue, Oct 14, 2014 at 09:51:22PM +0200, Jens Lehmann wrote: Am 14.10.2014 um 20:34 schrieb Max Kirillov: But here are a lot of nuances. For example, it makes sense to have a superproject checkout without submodules being initialized (so that they

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

2014-10-14 Thread Jens Lehmann
Am 14.10.2014 um 20:34 schrieb Max Kirillov: On Tue, Oct 14, 2014 at 10:26:42AM -0700, Junio C Hamano wrote: And multiple-worktree _is_ about keeping the same repository and history data (i.e. object database, refs, rerere database, reflogs for refs/*) only once, while allowing multiple working

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

2014-10-14 Thread Jens Lehmann
Am 14.10.2014 um 14:17 schrieb Duy Nguyen: On Sun, Oct 12, 2014 at 12:13 PM, Max Kirillov wrote: These are fixes of issues with submodules with use of multiple working trees. I think the patches look fine from the nd/multiple-work-trees writer's perspective. I know too little about submodules

Re: let git grep consider sub projects

2014-10-08 Thread Jens Lehmann
Am 08.10.2014 um 08:59 schrieb Olaf Hering: On Wed, Oct 08, Jens Lehmann wrote: git foo && git submodule foreach --recursive git foo Looks like a submodule is yet another thing, or I have to learn what a submodule is: olaf@bax:~/xen $ find . -name .git ./.git ./tools/qemu-xen-di

Re: let git grep consider sub projects

2014-10-07 Thread Jens Lehmann
Am 07.10.2014 um 21:12 schrieb Mikael Magnusson: On 7 October 2014 20:25, Junio C Hamano wrote: Olaf Hering writes: How can I teach 'git grep $string' to also consider subprojects? The build system of xen.git clones 4 other trees into a directory in its source tree during build. It would be

Re: Submodules and GIT_ALTERNATE_OBJECT_DIRECTORIES

2014-10-04 Thread Jens Lehmann
Am 03.10.2014 um 13:56 schrieb Michal Sojka: On Fri, Oct 03 2014, Jens Lehmann wrote: Am 30.09.2014 um 15:25 schrieb Michal Sojka: I'd like to shorten the time needed by our continuous integration (CI) tool to clone the source repositories. Currently the full clone takes about 10 minutes

Re: Submodules and GIT_ALTERNATE_OBJECT_DIRECTORIES

2014-10-03 Thread Jens Lehmann
Am 30.09.2014 um 15:25 schrieb Michal Sojka: I'd like to shorten the time needed by our continuous integration (CI) tool to clone the source repositories. Currently the full clone takes about 10 minutes (even from local server). Our main repository has several submodules so the CI tool runs "git

Re: diff-index does not consider a removed submodule to be staged with --ignore-submodules

2014-09-21 Thread Jens Lehmann
Am 20.09.2014 um 18:20 schrieb Daniel Hahler: After staging the removal of a submodule, diff-index does not consider this when "--ignore-submodules" is being used: # In a repository with submodule "sm": % git rm --cached sm % git diff-index --cached --quiet --ignore-submodules HE

Re: git-new-workdir submodules interact poorly with core.worktree

2014-09-13 Thread Jens Lehmann
Am 12.09.2014 um 15:58 schrieb Edward Z. Yang: tl;dr You can't git-new-workdir checkouts which use core.worktree. This is unfortunate because 'git submodule init' uses core.worktree by default, which means you can't recursively git-new-workdir without a hack. In the beginning, the Developer cre

Re: [PATCH/RFC] submodule: add ability to shallowly clone any branch in a submodule

2014-09-13 Thread Jens Lehmann
Am 11.09.2014 um 22:33 schrieb Cole: Thanks for the feedback, really appreciate it, and will try to reformat the patches as you have asked. Thanks! When you say you would like the patches split, do you mean into two separate threads, or just different patches part of the same thread? I thin

Re: [PATCH/RFC] submodule: add ability to shallowly clone any branch in a submodule

2014-09-13 Thread Jens Lehmann
Am 12.09.2014 um 07:21 schrieb Fredrik Gustafsson: On Thu, Sep 11, 2014 at 10:33:51PM +0200, Cole wrote: Also if there is anything else you are currently looking at regarding submodules or thinking about, I would be glad to hear about it or to try look at it while I am working on these changes.

Re: Diffs for submodule conflicts during rebase usually empty

2014-09-13 Thread Jens Lehmann
Am 12.09.2014 um 15:03 schrieb Edward Z. Yang: Hello Jens, Excerpts from Jens Lehmann's message of 2014-09-11 15:29:28 -0400: Git does know what's going on, just fails to display it properly in the diff, as the output of ls-files shows: $git ls-files -u 16 6a6e215138b7f343fba67ba

Re: [PATCH v3 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly

2014-09-11 Thread Jens Lehmann
Am 08.09.2014 um 19:29 schrieb Junio C Hamano: Thomas Rast writes: The existing code passed revs->dense_combined_merges along revs itself into the combine-diff functions, which is rather redundant. Remove the 'dense' argument until much further down the callchain to simplify callers. It was

Re: Diffs for submodule conflicts during rebase usually empty

2014-09-11 Thread Jens Lehmann
Am 11.09.2014 um 19:50 schrieb ezyang: Hello all, In many situations, if you have a submodule conflict during a rebase, and you type 'git diff' to get a summary of the situation, you will get an empty diff. Here's a simple transcript for one such case (I'm sorry I can't make it much shorter), t

Re: [PATCH/RFC] submodule: add ability to shallowly clone any branch in a submodule

2014-09-11 Thread Jens Lehmann
Am 11.09.2014 um 19:11 schrieb Cole Minnaar: Currently when specifying the `--depth` option to the 'submodule add' command, it can only create a shallow submodule clone of the currently active branch from the cloned repository. If a branch is specified using the `--branch` command, the 'submodule

Re: git submodule, multi-threading the update process for large number of registered submodules

2014-09-02 Thread Jens Lehmann
Hi José, Am 02.09.2014 um 09:53 schrieb Jose Paredes: Is there any way to run "git submodule update" in multiple threads? The use case: --- "git submodule update" seems to be inefficient when running sequentially on a large .gitmodules file. Assuming a git forest with over 7K gi

Re: Subtree with submodule inside?

2014-08-06 Thread Jens Lehmann
Am 06.08.2014 um 20:18 schrieb Robert Dailey: > On Wed, Aug 6, 2014 at 12:51 PM, Junio C Hamano wrote: >> My knee-jerk reaction would be "subtree would break submodules >> badly, don't use it" ;-). >> >> After all, I invented subtree merge as an ugly interim workaround >> before submodule subsyste

Re: Why is git submodule slow under windows

2014-07-18 Thread Jens Lehmann
Am 18.07.2014 15:02, schrieb Fredrik Gustafsson: > On Fri, Jul 18, 2014 at 02:08:36PM +0200, Thomas Braun wrote: >> Am 18.07.2014 12:14, schrieb Armbruster Joachim (BEG/EMS1): >>> Hello, >>> >>> We split a monolithic repository into ~50 submodules. The stored data >>> has the same size. In the 1:1

Re: [PATCH 00/14] Add submodule test harness

2014-07-14 Thread Jens Lehmann
Am 14.07.2014 03:01, schrieb Junio C Hamano: > Jens Lehmann writes: > >>> Perhaps squashing this to 7e8e5af9 instead? >> >> Yes please, this is much better than my first attempt. > > One thing that I found troubling is the ../../../ "three levels up" &

Re: [PATCH 00/14] Add submodule test harness

2014-07-12 Thread Jens Lehmann
Am 10.07.2014 22:52, schrieb Junio C Hamano: > Junio C Hamano writes: > >> Jens Lehmann writes: >> >>> I agree, but this case is special. The test asserts that nobody >>> added, modified or removed *anything* inside the .git directory. >>> The re

[PATCH v2 1/2] t/Makefile: check helper scripts for non-portable shell commands too

2014-07-09 Thread Jens Lehmann
hat by adding a THELPERS variable containing all shell scripts that aren't tests and add these to the "test-lint-shell-syntax" target too. Signed-off-by: Jens Lehmann --- t/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/Makefile b/t/Makefile index 8

  1   2   3   4   5   6   >