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: [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: 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: [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: 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: 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: 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: 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: [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: [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-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: 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: 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: [PATCH] [submodule] Add depth to submodule update

2013-06-27 Thread Jens Lehmann
Am 26.06.2013 23:03, schrieb Junio C Hamano: > Fredrik Gustafsson writes: > >> On Wed, Jun 26, 2013 at 12:11:32AM +0200, Heiko Voigt wrote: >>> On Tue, Jun 25, 2013 at 12:49:25AM +0200, Fredrik Gustafsson wrote: Used only when a clone is initialized. This is useful when the submodule(s)

Re: [PATCH] [submodule] Add depth to submodule update

2013-06-28 Thread Jens Lehmann
Am 28.06.2013 20:44, schrieb Junio C Hamano: > Heiko Voigt writes: > >> On Thu, Jun 27, 2013 at 04:54:45PM +0200, Jens Lehmann wrote: >> ... >>> Me too thinks adding "--depth" to "update" makes sense (and I don't >>> think that thi

Re: [PATCH v2] [submodule] Add --depth to submodule update/add

2013-06-28 Thread Jens Lehmann
Apparently due to a newly added test at the end of t7400 this patch doesn't apply cleanly to neither pu, next nor master for me. But it addresses all issues raised in the first round. Am 28.06.2013 15:22, schrieb Fredrik Gustafsson: > When a submodule is clone, clone it width the --depth flag. Thi

Re: [RFC/PATCH] submodule: add 'exec' option to submodule update

2013-06-30 Thread Jens Lehmann
Am 29.06.2013 11:11, schrieb Chris Packham: > On 28/06/13 22:42, Fredrik Gustafsson wrote: >> technically it looks fine to me (except for the lack of tests) but I'm >> not sure I follow the use case. >> >> In your case, you want to run a script to determinate if that certain >> submodule should use

Re: [RFC/PATCHv3] submodule update: allow custom update command

2013-07-02 Thread Jens Lehmann
Am 02.07.2013 12:12, schrieb Chris Packham: > Users can set submodule.$name.update to '!command' which will cause > 'command' to be run instead of checkout/merge/rebase. This allows the > user some finer grained control over how the update is done. The primary > motivation for this was interoperab

Re: [PATCH v3] [submodule] Add --depth to submodule update/add

2013-07-02 Thread Jens Lehmann
Sending again because the first one bounced. Am 02.07.2013 03:39, schrieb Fredrik Gustafsson: > When a submodule is clone, clone it width the --depth flag. This is useful > when the submodule(s) are huge and you're not really interested in anything > but the latest commit. > > Tests are added and

Re: [PATCH v4] [submodule] Add --depth to submodule update/add

2013-07-02 Thread Jens Lehmann
Am 02.07.2013 20:08, schrieb Fredrik Gustafsson: > Add the --depth option to the add and update commands of "git submodule", > which is then passed on to the clone command. This is useful when the > submodule(s) are huge and you're not really interested in anything but > the latest commit. > > Tes

Re: [RFC/PATCHv3] submodule update: allow custom update command

2013-07-02 Thread Jens Lehmann
Am 03.07.2013 01:26, schrieb Chris Packham: > On Wed, Jul 3, 2013 at 4:56 AM, Jens Lehmann wrote: >> Am 02.07.2013 12:12, schrieb Chris Packham: >>> --- a/Documentation/git-submodule.txt >>> +++ b/Documentation/git-submodule.txt >>> @@ -159,7 +159,9 @@ u

Re: [PATCH v5] [submodule] Add --depth to submodule update/add

2013-07-03 Thread Jens Lehmann
rything right. I appriciate your reviews. > > I left the "" on $5 for consistency as suggested. Thanks, looking good to me. Passes all tests and the new tests fail when the change in the submodule script is reverted. Acked-by: Jens Lehmann The only minor problem is that this patc

Re: [PATCH 1/2] apply, entry: speak of submodules instead of subprojects

2013-07-16 Thread Jens Lehmann
Am 16.07.2013 20:07, schrieb Jonathan Nieder: > Thomas Rast wrote: > >> There are only four (with some generous rounding) instances in the >> current source code where we speak of "subproject" instead of >> "submodule". They are as follows: > [...] >> Let's at least change the error messages to c

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Jens Lehmann
Am 22.07.2013 08:57, schrieb Junio C Hamano: > * jl/submodule-mv (2013-04-23) 5 commits > . submodule.c: duplicate real_path's return value > . rm: delete .gitmodules entry of submodules removed from the work tree > . Teach mv to update the path entry in .gitmodules for moved submodules > . Tea

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-22 Thread Jens Lehmann
Am 22.07.2013 09:48, schrieb Duy Nguyen: > On Mon, Jul 22, 2013 at 2:32 PM, Jens Lehmann wrote: >> Am 22.07.2013 08:57, schrieb Junio C Hamano: >>> * jl/submodule-mv (2013-04-23) 5 commits >>> . submodule.c: duplicate real_path's return value >>> . r

Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)

2013-07-28 Thread Jens Lehmann
Am 22.07.2013 22:47, schrieb Jens Lehmann: > Am 22.07.2013 09:48, schrieb Duy Nguyen: >> On Mon, Jul 22, 2013 at 2:32 PM, Jens Lehmann wrote: >>> Am 22.07.2013 08:57, schrieb Junio C Hamano: >>>> * jl/submodule-mv (2013-04-23) 5 commits >>>> . submo

Re: [PATCH gitk 0/4] gitk support for git log -L

2013-07-29 Thread Jens Lehmann
Am 29.07.2013 21:37, schrieb Thomas Rast: > Thomas Rast writes: > >> Thomas Rast writes: >> >>> Now that git log -L has hit master, I figure it's time to discuss the >>> corresponding change to gitk. >> >> Paul, any news on this? Any chance we can get it into the next release, >> since that wil

[PATCH v3 0/5] Teach mv to move submodules

2013-07-30 Thread Jens Lehmann
x27;t hit the silent breakage my last series showed when I ran the whole test suite). Jens Lehmann (5): Teach mv to move submodules together with their work trees Teach mv to move submodules using a gitfile submodule.c: add .gitmodules staging helper functions Teach mv to update the path

[PATCH v3 1/5] Teach mv to move submodules together with their work trees

2013-07-30 Thread Jens Lehmann
. As it doesn't find any index entries inside the submodule it claims the directory would be empty even though it isn't. Fix that by searching for the name without a trailing slash and continue if it is a submodule. Then rename() will move the submodule work tree just like it moves a f

[PATCH v3 2/5] Teach mv to move submodules using a gitfile

2013-07-30 Thread Jens Lehmann
ge to inform the user about that feature (and while at it change the description to not talk about a script anymore, as mv is a builtin for quite some time now). Signed-off-by: Jens Lehmann --- Documentation/git-mv.txt | 8 +++- builtin/mv.c | 19 +++ submod

[PATCH v3 3/5] submodule.c: add .gitmodules staging helper functions

2013-07-30 Thread Jens Lehmann
second function stages all modifications to the .gitmodules file, both will be used by subsequent patches for the mv and rm commands. Signed-off-by: Jens Lehmann --- submodule.c | 51 +++ submodule.h | 2 ++ 2 files changed, 53 insertions(+) diff

[PATCH v3 4/5] Teach mv to update the path entry in .gitmodules for moved submodules

2013-07-30 Thread Jens Lehmann
mv would have done that for him). Only when .gitmodules is found and contains merge conflicts the mv command will fail and tell the user to resolve the conflict before trying again. Also extend the man page to inform the user about this new feature. Signed-off-by: Jens Lehmann --- Documentation/gi

[PATCH v3 5/5] rm: delete .gitmodules entry of submodules removed from the work tree

2013-07-30 Thread Jens Lehmann
G FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM". In t7610 three uses of "git rm submod" had to be replaced with "git rm --cached submod" because that test expects .gitmodules and the work tree to stay untouched. Also in t7400 the tests for the remaining settings in th

Re: [PATCH v3 5/5] rm: delete .gitmodules entry of submodules removed from the work tree

2013-07-30 Thread Jens Lehmann
Am 30.07.2013 22:15, schrieb Fredrik Gustafsson: > On Tue, Jul 30, 2013 at 09:51:51PM +0200, Jens Lehmann wrote: >> +/* >> + * Try to remove the "submodule." section from .gitmodules where the >> given >> + * path is configured. Return 0 only if a .git

Re: [PATCH v3 3/5] submodule.c: add .gitmodules staging helper functions

2013-07-30 Thread Jens Lehmann
Am 30.07.2013 23:37, schrieb Junio C Hamano: > Jens Lehmann writes: > >> +int is_staging_gitmodules_ok() > > Will tweak this to: > > int is_staging_gitmodules_ok(void) > > and fix this as well: > >> +int is_staging_gitmodules_ok();

Re: [PATCH 1/2] submodule: fix confusing variable name

2013-08-04 Thread Jens Lehmann
Am 03.08.2013 20:14, schrieb Jonathan Nieder: > brian m. carlson wrote: > >> cmd_summary reads the output of git diff, but reads in the submodule >> path into a variable called name. Since this variable does not >> contain the name of the submodule, but the path, rename it to be >> clearer what d

Re: [PATCH 2/2] submodule: don't print status output with ignore=all

2013-08-04 Thread Jens Lehmann
Am 03.08.2013 20:24, schrieb Jonathan Nieder: > brian m. carlson wrote: > >> git status prints information for submodules, but it should ignore the >> status of >> those which have submodule..ignore set to all. Fix it so that it does >> properly ignore those which have that setting either in .gi

Re: [PATCH 1/2] submodule: fix confusing variable name

2013-08-06 Thread Jens Lehmann
Am 04.08.2013 23:29, schrieb Fredrik Gustafsson: > On Sun, Aug 04, 2013 at 07:34:48PM +0200, Jens Lehmann wrote: >> But we'll have to use sm_path here (like everywhere else in the >> submodule script), because we'll run into problems under Windows >> otherwise (see

Re: [PATCH v4 4/5] Teach mv to update the path entry in .gitmodules for moved submodules

2013-08-06 Thread Jens Lehmann
mv would have done that for him). Only when .gitmodules is found and contains merge conflicts the mv command will fail and tell the user to resolve the conflict before trying again. Also extend the man page to inform the user about this new feature. Signed-off-by: Jens Lehmann --- This version fixe

Re: [PATCH v4 5/5] rm: delete .gitmodules entry of submodules removed from the work tree

2013-08-06 Thread Jens Lehmann
G FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM". In t7610 three uses of "git rm submod" had to be replaced with "git rm --cached submod" because that test expects .gitmodules and the work tree to stay untouched. Also in t7400 the tests for the remaining settings in th

Re: [PATCH v4 5/5] rm: delete .gitmodules entry of submodules removed from the work tree

2013-08-07 Thread Jens Lehmann
Am 06.08.2013 23:11, schrieb Junio C Hamano: > Thanks, will replace the top two commits and queue. Looks like we > are getting ready for 'next'? I hope so, I'm not aware of any open issues. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vge

Re: [PATCH v4 5/5] rm: delete .gitmodules entry of submodules removed from the work tree

2013-08-08 Thread Jens Lehmann
Am 07.08.2013 20:28, schrieb Fredrik Gustafsson: > On Tue, Aug 06, 2013 at 02:11:56PM -0700, Junio C Hamano wrote: >> Thanks, will replace the top two commits and queue. Looks like we >> are getting ready for 'next'? > > I'm a bit curious about if we should move towards a reentrent libgit > (whic

Re: [PATCH] Git segmentation faults if submodule path is empty.

2013-08-15 Thread Jens Lehmann
Am 16.08.2013 03:51, schrieb Jharrod LaFon: > Git fails due to a segmentation fault if a submodule path is empty. > Here is an example .gitmodules that will cause a segmentation fault: > [submodule "foo-module"] > path > url = http://host/repo.git > $ git status > Segmentation fault (core d

Re: [PATCH v2 1/2] submodule: fix confusing variable name

2013-08-19 Thread Jens Lehmann
tually holds. > > Signed-off-by: brian m. carlson Thanks, this one is looking good to me. Acked-by: Jens Lehmann > --- > git-submodule.sh | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/git-submodule.sh b/git-submodule.sh > index 2979197..385

Re: [PATCH v2 2/2] submodule: don't print status output with ignore=all

2013-08-19 Thread Jens Lehmann
27;ll be worth the hassle. Thanks for fixing two known test breakages. Acked-by: Jens Lehmann > Signed-off-by: brian m. carlson > --- > git-submodule.sh | 7 +++ > t/t7508-status.sh | 4 ++-- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/gi

Re: [PATCH] submodule: prevent warning in summary output

2013-08-19 Thread Jens Lehmann
Am 19.08.2013 10:13, schrieb Chris Packham: > Hi Brian, > On 19/08/13 05:31, brian m. carlson wrote: >> When git submodule summary is run and there is a deleted submodule, there is >> an >> warning from git rev-parse: >> >> fatal: Not a git repository: '.vim/pathogen/.git' >> >> Silence this war

Re: [PATCH v2] submodule: prevent warning in summary output

2013-08-26 Thread Jens Lehmann
Am 26.08.2013 10:26, schrieb Chris Packham: > Hi Brian, > > Sorry for the delay. Same here. > On 20/08/13 12:26, brian m. carlson wrote: >> When git submodule summary is run and there is a deleted submodule, there is >> an >> warning from git rev-parse: >> >> fatal: Not a git repository: '.vi

[PATCH v2] Teach rm to remove submodules when given with a trailing '/'

2012-11-22 Thread Jens Lehmann
appended to the path of a submodule. Achieve this by chopping off trailing slashes from the path names given if they represent directories. Add tests to make sure that logic only applies to directories and not to files. Signed-off-by: Jens Lehmann --- Am 31.10.2012 07:29, schrieb Johannes Sixt: &

Re: [PATCH v4 2/4] git-submodule init: Record submodule..branch in repository config.

2012-11-27 Thread Jens Lehmann
Am 26.11.2012 22:00, schrieb W. Trevor King: > From: "W. Trevor King" > > This allows users to override the .gitmodules value with a > per-repository value. Your intentions makes lots of sense, but your patch does more than that. Copying the branch setting into .git/config sets the initial branc

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 30.11.2012 18:53, schrieb W. Trevor King: > In my v5 patch, I check for submodule..remote first in the usual > `git config` files. If I don't find what I'm looking for I fall back > on .gitmodules (basically Jens' suggestion). However, my initial > copying-to-.git/config approach was mostly do

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 13:48, schrieb W. Trevor King: > On Fri, Nov 30, 2012 at 06:52:22PM -0500, Phil Hord wrote: >> If I never 'submodule init' a submodule, it does not get visited by 'git >> submodule foreach', among others. I think some people use this behavior >> explicitly. > > This is something I

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 00:52, schrieb Phil Hord: > If I never 'submodule init' a submodule, it does not get visited by > 'git submodule foreach', among others. I think some people use this > behavior explicitly. > > On the other hand, I've also notice that a submodule which I have > removed does not get d

[PATCH] submodule: add 'deinit' command

2012-12-01 Thread Jens Lehmann
ding whether removing or unregistering the submodule is the right thing to do for him. Signed-off-by: Jens Lehmann --- Am 01.12.2012 16:56, schrieb Jens Lehmann: > Am 01.12.2012 00:52, schrieb Phil Hord: >> If I never 'submodule init' a submodule, it does not get visited by

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 17:30, schrieb W. Trevor King: > On Sat, Dec 01, 2012 at 04:38:02PM +0100, Jens Lehmann wrote: >> You need to handle the 'url' setting differently. While I think the 'update' >> setting should not be copied into .git/config at all (because it make

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 18:49, schrieb W. Trevor King: > I think removing `init` will cause some compatibility issues anyway, > so I was re-imaging how you do it. I don't think update='none' and > "don't populate my submodule" are distinct ideas, while a locally > configured url="somwhere" and "please popul

Re: [PATCH v5 0/2] submodule update: add --remote for submodule's upstream changes

2012-12-02 Thread Jens Lehmann
Am 30.11.2012 04:27, schrieb W. Trevor King: > On Thu, Nov 29, 2012 at 08:11:20PM -0500, Phil Hord wrote: >> On Thu, Nov 29, 2012 at 2:13 PM, W. Trevor King wrote: >>> On Thu, Nov 29, 2012 at 01:29:12PM -0500, Phil Hord wrote: But I really don't want to figure out how to handle submodule

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

2012-12-02 Thread Jens Lehmann
Am 02.12.2012 03:00, schrieb Junio C Hamano: > Jens Lehmann writes: > >> With "git submodule init" the user is able to tell git he cares about one >> or more submodules and wants to have it populated on the next call to "git >> submodule update". But

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-02 Thread Jens Lehmann
sagree on that, we just don't agree on how to > implement it. Nope, it is already implemented and you are arguing to change the current implementation. To quote from another mail: Am 01.12.2012 18:49, schrieb W. Trevor King: > On Sat, Dec 01, 2012 at 06:25:17PM +0100, Jens Lehmann wrote: >

[PATCH v2] submodule: add 'deinit' command

2012-12-04 Thread Jens Lehmann
user in deciding whether removing or unregistering the submodule is the right thing to do for him. Signed-off-by: Jens Lehmann --- Am 03.12.2012 08:58, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Maybe the principle of least surprise is better followed when we >&

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

2012-12-12 Thread Jens Lehmann
Am 12.12.2012 16:08, schrieb Michael J Gruber: > Jens Lehmann venit, vidit, dixit 04.12.2012 22:48: >> With "git submodule init" the user is able to tell git he cares about one >> or more submodules and wants to have it populated on the next call to "git >> su

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

2012-12-12 Thread Jens Lehmann
Am 12.12.2012 20:32, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Especially as I suspect the number of submodule users having >> customized those in .git/config is not that high ... > > I thought the point of "deinit" was to say "I am not int

Re: [BUG] git submodule update is not fail safe

2013-01-05 Thread Jens Lehmann
Am 04.01.2013 22:51, schrieb Junio C Hamano: > Manlio Perillo writes: > >> $ git submodule update --init >> ... >> Submodule 'roms/vgabios' (git://git.qemu.org/vgabios.git/) registered >> for path 'roms/vgabios' >> fatal: unable to connect to anongit.freedesktop.org: >> anongit.freedesktop.org[0:

Re: [BUG] git submodule update is not fail safe

2013-01-05 Thread Jens Lehmann
Am 05.01.2013 14:52, schrieb Manlio Perillo: > Il 04/01/2013 22:51, Junio C Hamano ha scritto: >> Manlio Perillo writes: > >>> $ git submodule update --init >>> ... >>> Submodule 'roms/vgabios' (git://git.qemu.org/vgabios.git/) registered >>> for path 'roms/vgabios' >>> fatal: unable to connect t

Re: [BUG] git submodule update is not fail safe

2013-01-05 Thread Jens Lehmann
Am 05.01.2013 15:01, schrieb Jens Lehmann: > Am 04.01.2013 22:51, schrieb Junio C Hamano: >> Manlio Perillo writes: >> >>> $ git submodule update --init >>> ... >>> Submodule 'roms/vgabios' (git://git.qemu.org/vgabios.git/) registered >>

[PATCH] clone: support atomic operation with --separate-git-dir

2013-01-05 Thread Jens Lehmann
so add a test for this to t5600 (and while at it fix the former last test to not cd into a directory to test for its existence but use "test -d" instead). Reported-by: Manlio Perillo Signed-off-by: Jens Lehmann --- Am 05.01.2013 15:50, schrieb Jens Lehmann: > Am 05.01.2013 15:01, sch

Re: Moving (renaming) submodules, recipe/script

2013-01-06 Thread Jens Lehmann
Am 07.01.2013 02:39, schrieb Jonathan Nieder: > (just cc-ing Jens and Peter, who might be interested) I´m currently working on teaching mv to move submodules and intend to send those patches to the list after finishing submodule deinit. Please see https://github.com/jlehmann/git-submod-enhanceme

Re: Moving (renaming) submodules, recipe/script

2013-01-07 Thread Jens Lehmann
Am 07.01.2013 08:44, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 07.01.2013 02:39, schrieb Jonathan Nieder: >>> (just cc-ing Jens and Peter, who might be interested) >> >> I´m currently working on teaching mv to move submodules and intend >>

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread Jens Lehmann
Am 08.01.2013 15:32, schrieb W. Trevor King: > On Mon, Jan 07, 2013 at 07:59:53AM +0100, Jens Lehmann wrote: >> Am 07.01.2013 02:39, schrieb Jonathan Nieder: >>> (just cc-ing Jens and Peter, who might be interested) >> >> I´m currently working on teaching mv to mo

Re: [PATCH] clone: forbid --bare --separate-git-dir

2013-01-08 Thread Jens Lehmann
Am 08.01.2013 15:16, schrieb Duy Nguyen: > On Sun, Jan 06, 2013 at 02:19:48AM -0800, Jonathan Nieder wrote: >> Unfortunately we forgot to forbid the --bare >> --separate-git-dir combination. In practice, we know no one >> could be using --bare with --separate-git-dir because it is >

Re: git push --recurse-submodules=on-demand with submodule push tag

2013-01-08 Thread Jens Lehmann
Am 08.01.2013 17:35, schrieb 乙酸鋰: > In superproject, can I call git push --recurse-submodules=on-demand > that pushes submodule with the submodule's tags? As that seems to call a plain "git push" in the submodule I think the tags won't be pushed by this command. > Very often I change version and

Re: git fetch without --recurse-submodules option

2013-01-16 Thread Jens Lehmann
Am 16.01.2013 06:45, schrieb 乙酸鋰: > With git pull or git fetch without specifying --recurse-submodules, > what is the default action? on-demand fetch (unless something else is configured). > It seems git fetches submodules wtihout specifying --recurse-submodules. > If this is not clear, please up

Re: [PATCH v2] Allow custom "comment char"

2013-01-16 Thread Jens Lehmann
Am 16.01.2013 20:18, schrieb Ralf Thielow: > From: Junio C Hamano > > Some users do want to write a line that begin with a pound sign, #, > in their commit log message. Many tracking system recognise > a token of # form, for example. > > The support we offer these use cases is not very friendly

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-13 Thread Jens Lehmann
Am 13.05.2013 15:57, schrieb Jan Engelhardt: > On Monday 2013-05-13 14:54, Thomas Rast wrote: >> My vote is G+E. > > Essentially, so is mine. ... Same here. I frequently get asked to switch Git back to English when the "LANG=C" gets lost, because my coworkers and myself - almost all of which are

Re: [PATCH 0/4] Coverage support revisited

2013-05-13 Thread Jens Lehmann
Am 13.05.2013 23:27, schrieb Thomas Rast: > Jens asked me at git-merge if coverage support was still available. > Turns out it is, but there were some weirdnesses. So this should fix > them. It is relly slow as you still have to run the tests one by > one; despite claims in the wild that it i

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-15 Thread Jens Lehmann
Am 15.05.2013 12:23, schrieb Holger Hellmuth (IKS): > Am 14.05.2013 19:51, schrieb Ralf Thielow: >> - repository = Projektarchiv >> - bare repository = bloßes Projektarchiv >> + repository = Projektarchiv, (or just Repository?) >> + bare repository = bloßes Projektarchiv (-||-), (reines, pures Repo

Re: English/German terminology, git.git's de.po, and pro-git

2013-05-15 Thread Jens Lehmann
Am 15.05.2013 13:56, schrieb Jan Engelhardt: > On Wednesday 2013-05-15 13:26, Jens Lehmann wrote: >> but I believe "Packdatei" would be a much better translation (especially as >> the translation of "pack(verb)" is "packen"). I find it natural that

Re: [PATCHv2] git-submodule.txt: Clarify 'init' and 'add' subcommands.

2013-05-16 Thread Jens Lehmann
ady been added elsewhere. Describe that > arguments limit the submodules that are configured. > > Signed-off-by: Dale Worley Thanks, this patch addresses all issues raised. Acked-by: Jens Lehmann > --- > This patch seems to have all the features that we have discussed: > > - Desc

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-05-30 Thread Jens Lehmann
Am 30.05.2013 01:58, schrieb Junio C Hamano: > * jl/submodule-mv (2013-04-23) 5 commits > (merged to 'next' on 2013-04-23 at c04f574) > + submodule.c: duplicate real_path's return value > (merged to 'next' on 2013-04-19 at 45ae3c9) > + rm: delete .gitmodules entry of submodules removed from t

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-05-30 Thread Jens Lehmann
Am 30.05.2013 01:58, schrieb Junio C Hamano: > * jk/submodule-subdirectory-ok (2013-04-24) 3 commits > (merged to 'next' on 2013-04-24 at 6306b29) > + submodule: fix quoting in relative_path() > (merged to 'next' on 2013-04-22 at f211e25) > + submodule: drop the top-level requirement > + rev

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-03 Thread Jens Lehmann
Am 02.06.2013 20:50, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 30.05.2013 01:58, schrieb Junio C Hamano: >>> * jl/submodule-mv (2013-04-23) 5 commits >>> (merged to 'next' on 2013-04-23 at c04f574) >>> + submodule.c: duplicate re

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-03 Thread Jens Lehmann
Am 31.05.2013 21:40, schrieb John Keeping: > On Thu, May 30, 2013 at 09:23:40PM +0200, Jens Lehmann wrote: >> Am 30.05.2013 01:58, schrieb Junio C Hamano: >>> * jk/submodule-subdirectory-ok (2013-04-24) 3 commits >>> (merged to 'next' on 2013-04-24 at 6306

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-04 Thread Jens Lehmann
Am 04.06.2013 14:48, schrieb John Keeping: > On Tue, Jun 04, 2013 at 09:17:17PM +1000, Heiko Voigt wrote: >> On Tue, Jun 04, 2013 at 09:10:45AM +0100, John Keeping wrote: >>> On Tue, Jun 04, 2013 at 03:29:51PM +1000, Heiko Voigt wrote: On Mon, Jun 03, 2013 at 11:23:41PM +0100, John Keeping wro

Re: [PATCH 1/2] submodule: handle multibyte characters in name

2013-06-12 Thread Jens Lehmann
Am 12.06.2013 23:06, schrieb Junio C Hamano: > Fredrik Gustafsson writes: > >> Bugg reported here: >> http://thread.gmane.org/gmane.comp.version-control.git/218922/focus=226791 > > The URL is nice supplemental info as footnote, but please write log > message in a way that a reader can understand

Re: [PATCH v4 0/6] submodule: drop the top-level requirement

2013-06-17 Thread Jens Lehmann
Am 16.06.2013 16:18, schrieb John Keeping: > Changes since v3: > > * There are four new patches, three of which are style fixes for > existing tests and one fixes an existing error message to return a > more accurate path when recursing. > > * You now cannot run "git submodule add " from a >

Re: Bug: `gitsubmodule` does not list modules with unicode characters

2013-03-25 Thread Jens Lehmann
Am 23.03.2013 17:28, schrieb Ilya Kulakov: > The `git submodule` commands seem to ignore modules which paths contain > unicode characters. > > Consider the following steps to reproduce the problem: > > 1. Create a directory with name that contains at least one unicode character > (e.g. "ûñ

Re: Why does 'submodule add' stage the relevant portions?

2013-03-25 Thread Jens Lehmann
Am 24.03.2013 18:38, schrieb Ramkumar Ramachandra: > I find this behavior very inconsistent and annoying. Why would I want > to commit the submodule change immediately? Maybe I want to batch it > up with other changes and stage it at a later time. Why should I have > to unstage them manually now

Re: Why does 'submodule add' stage the relevant portions?

2013-03-25 Thread Jens Lehmann
Am 25.03.2013 09:59, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> Am 24.03.2013 18:38, schrieb Ramkumar Ramachandra: >>> I find this behavior very inconsistent and annoying. Why would I want >>> to commit the submodule change immediately? Maybe I want to

Re: Why does 'submodule add' stage the relevant portions?

2013-03-25 Thread Jens Lehmann
Am 25.03.2013 20:57, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> Am 25.03.2013 09:59, schrieb Ramkumar Ramachandra: >>> In my opinion, the 'git submodule add ' form is broken, because >>> it doesn't relocate the object store of the submodule

Re: Why does 'submodule add' stage the relevant portions?

2013-03-26 Thread Jens Lehmann
Am 26.03.2013 08:57, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> And leaving aside 'add', there are tons of submodules out there >> which were cloned with older Git who have their .git directory >> inside the work tree. So a new subcommand (or at least a

Re: Composing git repositories

2013-03-27 Thread Jens Lehmann
Am 27.03.2013 18:02, schrieb Ramkumar Ramachandra: > Junio C Hamano wrote: >> Ramkumar Ramachandra writes: >>> Junio C Hamano wrote: So you have to stash it somewhere. We could have made it to move them to $HOME/.safeplace or somewhere totally unrelated to the superproject. So in

Re: Composing git repositories

2013-03-28 Thread Jens Lehmann
Am 28.03.2013 11:01, schrieb Ramkumar Ramachandra: > Jonathan Nieder wrote: >> Do you mean that you wish you could ignore subrepository boundaries >> and use commands like >> >> git clone --recurse-submodules http://git.zx2c4.com/cgit >> cd cgit >> vi git/cache.h >>

Re: Composing git repositories

2013-03-28 Thread Jens Lehmann
Am 28.03.2013 12:48, schrieb Ramkumar Ramachandra: > Okay, here's a first draft of the new design. The new mediator object > should look like: > > name = git > ref = v1.7.8 > > The name is looked up in refs/modules/, which in turn looks like: > > [submodule "git"] > origin =

Re: Composing git repositories

2013-03-28 Thread Jens Lehmann
Am 28.03.2013 10:16, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> Unless you acknowledge that submodules are a different repo, you'll >> always run into problems. I believe future enhancements will make >> this less tedious, but in the end they will stay separ

Re: Composing git repositories

2013-04-01 Thread Jens Lehmann
Am 31.03.2013 22:34, schrieb Ramkumar Ramachandra: >> Are you aware that current Git code already stats all files across >> all submodules recursive by default? So (again) no problem here, we >> do that already (unless configured otherwise). > > I didn't know that. Why does it do this? To show t

Re: Composing git repositories

2013-04-01 Thread Jens Lehmann
Am 01.04.2013 01:50, schrieb Phil Hord: > On Sun, Mar 31, 2013 at 4:34 PM, Ramkumar Ramachandra > wrote: >> Jens Lehmann wrote: >>> Guess what: submodules are the solution for a certain set of use >>> cases, and tools like subtree are a solution for another set

[PATCH] submodule deinit: clarify work tree removal message

2013-04-01 Thread Jens Lehmann
ts, no matter if empty or not. Also extend the tests in t7400 to make sure the "Cleared directory" line is printed correctly. Reported-by: Phil Hord Signed-off-by: Jens Lehmann --- Am 19.03.2013 02:45, schrieb Junio C Hamano: > Jens Lehmann writes: >> Am 12.03.2013 17:22,

Re: Composing git repositories

2013-04-02 Thread Jens Lehmann
Am 02.04.2013 19:44, schrieb Ramkumar Ramachandra: > Jonathan Nieder wrote: >> Elated is probably not the right word. More "annoyed at being told >> their work is ugly without an accompanying concrete and actionable bug >> report". :) > > If I had an actionable report, I'd have started hammering

Re: Composing git repositories

2013-04-02 Thread Jens Lehmann
Am 02.04.2013 20:35, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> But I think we recently learned to support that use case with >> submodules. I think there are two floating models: >> >> - Tracked: >> [...] >> >> - Untracked: >>

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

2013-04-02 Thread Jens Lehmann
Seems were getting closer, some comments from a quick read of your patch below. Am 26.03.2013 05:03, schrieb Eric Cousineau: > From 2c2923ada809d671828aa58dcda05a1b71222b70 Mon Sep 17 00:00:00 2001 > From: Eric Cousineau > Date: Mon, 25 Mar 2013 22:27:06 -0500 > Subject: [PATCH] submodule-foreach

[PATCH/RFC 0/3] Teach mv to move submodules

2013-04-03 Thread Jens Lehmann
ot different from what Git currently does with removed submodules). Replacing a directory containing files tracked by Git or vice versa is still not possible, another issue to be fixed by the recursive submodule update. I tried to CC all parties which showed interest in this topic, hopefully I didn&

<    1   2   3   4   5   6   >