Re: [PATCH] submodule: Respect reqested branch on all clones

2014-01-04 Thread Heiko Voigt
Hi, On Fri, Jan 03, 2014 at 10:06:11AM -0800, W. Trevor King wrote: From: W. Trevor King wk...@tremily.us The previous code only checked out the requested branch in cmd_add. This commit moves the branch-checkout logic into module_clone, where it can be shared by cmd_add and cmd_update. I

Re: [PATCH] Documentation/gitmodules: Only 'update' and 'url' are required

2014-01-04 Thread Heiko Voigt
On Fri, Jan 03, 2014 at 10:31:22AM -0800, W. Trevor King wrote: From: W. Trevor King wk...@tremily.us Before this commit, all the settings fell under the initial Each submodule section also contains the following required keys:. The example shows sections with just 'update' and 'url'

Re: Re: [PATCH] submodule: Respect reqested branch on all clones

2014-01-04 Thread Heiko Voigt
On Sat, Jan 04, 2014 at 02:54:01PM -0800, W. Trevor King wrote: On Sat, Jan 04, 2014 at 11:09:15PM +0100, Heiko Voigt wrote: On Fri, Jan 03, 2014 at 10:06:11AM -0800, W. Trevor King wrote: @@ -306,7 +307,14 @@ module_clone() echo gitdir: $rel/$a $sm_path/.git rel=$(echo

Re: git fetch doesn't ignore funny refs

2014-01-04 Thread Heiko Voigt
On Tue, Dec 17, 2013 at 01:35:33PM +0100, Lorenzo Keller wrote: A check as this one: if (check_refname_format(ref-name, 0)) continue; fixes the problem for me. I report here bug and fix in the hope it can be reviewed and integrated in future git releases. Since it seems you already

Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-05 Thread Heiko Voigt
On Sun, Jan 05, 2014 at 01:24:58PM -0800, W. Trevor King wrote: On Sun, Jan 05, 2014 at 08:48:50PM +0100, Heiko Voigt wrote: On Sun, Jan 05, 2014 at 08:17:00AM -0800, W. Trevor King wrote: It's not clear if this refers to the initial-clone update, future post-clone updates, or both

Re: Re: [PATCH 2/2] Introduce git submodule attached update

2014-01-06 Thread Heiko Voigt
On Sun, Jan 05, 2014 at 10:46:11PM +0100, Francesco Pretto wrote: 2014/1/5 Heiko Voigt hvo...@hvoigt.net: The following questions directly pop into my mind: - What means the maintainer does not track the submodules sha1? Does that mean the superproject always refers to submodule

Re: Re: [PATCH 2/2] Introduce git submodule attached update

2014-01-06 Thread Heiko Voigt
On Mon, Jan 06, 2014 at 12:22:23AM +0100, Francesco Pretto wrote: 2014/1/5 Heiko Voigt hvo...@hvoigt.net: Could you please extend the description of your use-case so we can understand your goal better? Maybe I found better words to explain you my goal: the current git submodule use-case

Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-06 Thread Heiko Voigt
On Sun, Jan 05, 2014 at 10:27:19PM +0100, Francesco Pretto wrote: 2014/1/5 W. Trevor King wk...@tremily.us: On Sun, Jan 05, 2014 at 04:53:12AM +0100, Francesco Pretto wrote: Also it could break some users that rely on the current behavior. The current code always has a detached HEAD after

Re: Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-06 Thread Heiko Voigt
On Sun, Jan 05, 2014 at 03:39:43PM -0800, W. Trevor King wrote: On Sun, Jan 05, 2014 at 11:57:33PM +0100, Heiko Voigt wrote: On Sun, Jan 05, 2014 at 01:24:58PM -0800, W. Trevor King wrote: If submodule.name.branch is set, it *always* creates a new local branch of that name pointing

Re: Re: [PATCH 2/2] Introduce git submodule attached update

2014-01-07 Thread Heiko Voigt
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Mon, Jan 06, 2014 at 08:10:04PM -0800, W. Trevor King wrote: Here's an attempted summary of our desires, and my ideal route forward: * Preferred local submodule branches for each superproject branch. * Not currently supported by Git. *

Re: Re: Submodule relative URL problems

2014-01-13 Thread Heiko Voigt
Hi, On Mon, Jan 13, 2014 at 11:55:18AM -0800, Jonathan Nieder wrote: Lianheng Tong wrote: git clone W1:path to A on W1/.git path to A on W2 Interesting. Thoughts: * More typical usage is to clone from a bare repository (A.git), which wouldn't have this problem. But I think

Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-14 Thread Heiko Voigt
Hi, On Thu, Jan 09, 2014 at 02:18:40PM -0800, W. Trevor King wrote: On Thu, Jan 09, 2014 at 10:40:52PM +0100, Jens Lehmann wrote: Am 09.01.2014 20:55, schrieb W. Trevor King: On Thu, Jan 09, 2014 at 08:23:07PM +0100, Jens Lehmann wrote: Am 09.01.2014 18:32, schrieb W. Trevor King:

Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-14 Thread Heiko Voigt
On Tue, Jan 14, 2014 at 08:57:09AM -0800, W. Trevor King wrote: On Thu, Jan 09, 2014 at 10:40:52PM +0100, Jens Lehmann wrote: Am 09.01.2014 20:55, schrieb W. Trevor King: Maybe you meant for checkout I can easily overwrite the local changes with the upstream branch, which is what

Re: Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-14 Thread Heiko Voigt
Hi, On Tue, Jan 14, 2014 at 11:24:45AM +0100, Heiko Voigt wrote: I will write another post about how I think we should/can proceed. and here is my suggestion how we should proceed. I think there have been many interesting ideas in this thread but IMO some of them tried to achieve a little bit

Re: Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-14 Thread Heiko Voigt
On Tue, Jan 14, 2014 at 01:42:09PM -0800, W. Trevor King wrote: On Tue, Jan 14, 2014 at 09:58:30PM +0100, Heiko Voigt wrote: A typical workflow where a feature in a project needs some extension or change in a submodule goes like this: 1. The developer does his changes locally

Re: Re: [RFC v2] submodule: Respect requested branch on all clones

2014-01-14 Thread Heiko Voigt
On Tue, Jan 14, 2014 at 02:22:31PM -0800, W. Trevor King wrote: On Tue, Jan 14, 2014 at 10:46:08PM +0100, Heiko Voigt wrote: I would like to step back a bit and get back to the original problem at hand: Francescos original use case of an attached head for direct commits on a stable branch

Re: Re: [PATCH/RFC] git-gui: Add a 'recursive' checkbox in the clone menu.

2014-03-06 Thread Heiko Voigt
On Thu, Mar 06, 2014 at 08:35:48PM +0100, Jens Lehmann wrote: Am 06.03.2014 01:15, schrieb Henri GEIST: Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit : Am 05.03.2014 00:01, schrieb Henri GEIST: - Wouldn't it be easier to pass the '--recurse-submodules option to the git

Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-10 Thread Heiko Voigt
On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote: Le samedi 08 mars 2014 à 00:00 +0100, Jens Lehmann a écrit : Am 06.03.2014 23:20, schrieb Henri GEIST: What is the use case you are trying to solve and why can that not be handled by adding subsubmodule inside submodule?

[PATCH] implement submodule config cache for lookup of submodule names

2014-03-10 Thread Heiko Voigt
rather than reading from the worktree. For new submodule it needs to lookup the name from its path to allow cloning new submodules into the .git folder so they can be checked out without any network interaction when the user does a checkout of that revision. Signed-off-by: Heiko Voigt

Re: Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-11 Thread Heiko Voigt
On Tue, Mar 11, 2014 at 10:55:03AM +0100, Henri GEIST wrote: Le lundi 10 mars 2014 à 21:32 +0100, Heiko Voigt a écrit : On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote: Le samedi 08 mars 2014 à 00:00 +0100, Jens Lehmann a écrit : Am 06.03.2014 23:20, schrieb Henri GEIST

Re: Re: [PATCH] implement submodule config cache for lookup of submodule names

2014-03-12 Thread Heiko Voigt
On Tue, Mar 11, 2014 at 05:58:08PM -0400, Jeff King wrote: On Mon, Mar 10, 2014 at 10:24:12PM +0100, Heiko Voigt wrote: I have also moved all functions into the new submodule-config-cache module. I am not completely satisfied with the naming since it is quite long. If someone comes up

Re: Re: [PATCH] implement submodule config cache for lookup of submodule names

2014-03-12 Thread Heiko Voigt
Hi, On Tue, Mar 11, 2014 at 07:28:52PM -0700, Jonathan Nieder wrote: Heiko Voigt wrote: This submodule configuration cache allows us to lazily read .gitmodules configurations by commit into a runtime cache which can then be used to easily lookup values from it. Currently only the values

Re: Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Heiko Voigt
On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to

Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)

2014-04-02 Thread Heiko Voigt
On Mon, Mar 31, 2014 at 05:29:03PM -0700, Junio C Hamano wrote: * hv/submodule-ignore-fix (2013-12-06) 4 commits - disable complete ignorance of submodules for index - HEAD diff - always show committed submodules in summary after commit - teach add -f option for ignored submodules - fix

Re: Re: [RFC/PATCH 2/4] Submodules: Add the lib-submodule-update.sh test library

2014-04-18 Thread Heiko Voigt
On Thu, Apr 17, 2014 at 11:30:04PM +0200, Jens Lehmann wrote: - Heiko's config cache for submodules patch Needed for my recursive checkout series to populate new submodules. Which will be followed by my recursive fetch series, which is also the last part of what started with this:

Re: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-19 Thread Heiko Voigt
Hi Marat, On Thu, Apr 03, 2014 at 05:18:50PM +0400, ma...@slonopotamus.org wrote: I'm proud to announce WinGit: an attempt to bring Git powers to 64-bit Windows. So the reason for this new package is that you need 64bit binaries? Relationship with msysgit = Unlike

Re: Re: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-19 Thread Heiko Voigt
On Sat, Apr 19, 2014 at 05:35:07PM +0400, Marat Radchenko wrote: there are no 64 bit binaries shipped with msysgit is that nobody needed them That's wrong. Google for 'windows x64 git' or 'msysgit x64'. People need it. There's even an issue [3] (stalled several years ago) in msysgit

Re: Re: [msysGit] Re: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

2014-04-19 Thread Heiko Voigt
On Sat, Apr 19, 2014 at 08:58:32PM +0400, Marat Radchenko wrote: On Sat, Apr 19, 2014 at 05:24:33PM +0200, Johannes Schindelin wrote: Marat, please do not add to the confusion. msysGit is the name of the *development environment* for developing Git for Windows. This confusion comes from

Re: [PATCH] Windows: Always normalize paths to Windows-style

2014-05-07 Thread Heiko Voigt
Hi, On Mon, Apr 28, 2014 at 04:29:31PM +0200, Stepan Kasal wrote: this is another patch that lives in msysGit for a long time. Originally, it had two parts: (Cf https://github.com/msysgit/git/commit/64a8a03 ) 1) adding alias pwd='pwd -W' to git-sh-setup.sh This one went upstream, though

Re: Re: [PATCH 3/3] Silence a bunch of format-zero-length warnings

2014-05-07 Thread Heiko Voigt
On Wed, May 07, 2014 at 11:19:09AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Sun, May 04, 2014 at 07:01:22PM +, brian m. carlson wrote: On Sun, May 04, 2014 at 01:12:55AM -0500, Felipe Contreras wrote: This is in gcc 4.9.0: wt-status.c: In function

Re: Subtree with submodule inside?

2014-08-07 Thread Heiko Voigt
On Wed, Aug 06, 2014 at 04:51:52PM -0700, Jonathan Nieder wrote: Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: 2. Submodules aware of their superproject and of the parent's branches. In other words, submodules would act as though under refs/ they had a

Re: Relative submodule URLs

2014-08-19 Thread Heiko Voigt
a branch that does not have a remote configured. Since they do not have 'origin' as a remote and git submodule update --init --recursive path/to/submodule fails. Right? Cheers Heiko [1] From: Heiko Voigt hvo...@hvoigt.net Subject: [PATCH] submodule: use 'upstream' instead of 'origin

Re: Re: Relative submodule URLs

2014-08-19 Thread Heiko Voigt
On Tue, Aug 19, 2014 at 11:50:08AM -0500, Robert Dailey wrote: Maybe I'm misunderstanding something here and you can help me out. All the reading I've done (mostly github) says that 'upstream' points to the authoritative repository that you forked from but do not have permissions to write

Re: Re: Re: Relative submodule URLs

2014-08-19 Thread Heiko Voigt
On Tue, Aug 19, 2014 at 03:23:36PM -0500, Robert Dailey wrote: On Tue, Aug 19, 2014 at 2:30 PM, Heiko Voigt hvo...@hvoigt.net wrote: Well the remote for the submodule is currently only calculated once, when you do the initial git submodule update --init that clones

Re: Re: Re: Relative submodule URLs

2014-08-21 Thread Heiko Voigt
On Wed, Aug 20, 2014 at 08:18:12AM -0500, Robert Dailey wrote: On Tue, Aug 19, 2014 at 3:57 PM, Heiko Voigt hvo...@hvoigt.net wrote: I would actually error out when specified in already cloned state. Because otherwise the user might expect the remote to be updated. Since we are currently

Re: What's cooking in git.git (Aug 2014, #03; Wed, 20)

2014-08-21 Thread Heiko Voigt
On Wed, Aug 20, 2014 at 04:17:33PM -0700, Junio C Hamano wrote: * hv/submodule-config (2014-06-30) 4 commits (merged to 'next' on 2014-07-17 at 5e0ce45) + do not die on error of parsing fetchrecursesubmodules option + use new config API for worktree configurations of submodules + extract

Re: Re: Relative submodule URLs

2014-08-24 Thread Heiko Voigt
Hi, since the mail got quite long. To avoid 'tl;dr', I talk about two topics in this mail: * Submodule settings for default remote (complex, future) * New --with--remote parameter for 'git submodule' (simple, now) Depending on your interest you might want to skip the first part of the

Re: Re: Re: Relative submodule URLs

2014-08-26 Thread Heiko Voigt
On Mon, Aug 25, 2014 at 09:29:07AM -0500, Robert Dailey wrote: On Sun, Aug 24, 2014 at 8:34 AM, Heiko Voigt hvo...@hvoigt.net wrote: New --with--remote parameter for 'git submodule' While having said all that about submodule settings I

Re: Re: Re: Re: Relative submodule URLs

2014-08-26 Thread Heiko Voigt
On Tue, Aug 26, 2014 at 10:18:48AM -0500, Robert Dailey wrote: On Tue, Aug 26, 2014 at 1:28 AM, Heiko Voigt hvo...@hvoigt.net wrote: My last email response was in violation of your request to keep the two topics separate, sorry about that. I started typing it this weekend and completed

Re: Re: Relative submodule URLs

2014-08-28 Thread Heiko Voigt
On Thu, Aug 28, 2014 at 01:44:18PM -0400, Marc Branchaud wrote: Heiko also said this: On Fri, Aug 22, 2014 at 12:00:07PM -0400, Marc Branchaud wrote: With relative-path submodules, the push's target repo *must* also have the submodules in their proper places, so that they can get updated.

[PATCH v5 0/5] allow more sources for config values

2013-07-11 Thread Heiko Voigt
of the do_config_from() function anymore. Cheers Heiko [1] http://article.gmane.org/gmane.comp.version-control.git/223964 [2] https://github.com/hvoigt/git/commits/hv/strbuf_config_parsing-series5 Heiko Voigt (5): config: factor out config file stack management config: drop cf validity check

[PATCH v5 1/5] config: factor out config file stack management

2013-07-11 Thread Heiko Voigt
Because a config callback may start parsing a new file, the global context regarding the current config file is stored as a stack. Currently we only need to manage that stack from git_config_from_file. Let's factor it out to allow new sources of config data. Signed-off-by: Heiko Voigt hvo

[PATCH v5 2/5] config: drop cf validity check in get_next_char()

2013-07-11 Thread Heiko Voigt
- parse_value - get_next_char - get_base_var - get_next_char - get_extended_base_var - get_next_char The variable is initialized in do_config_from. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- config.c | 29

[PATCH v5 3/5] config: make parsing stack struct independent from actual data source

2013-07-11 Thread Heiko Voigt
. A new source can use this to store its custom data. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- config.c | 64 +++- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/config.c b/config.c index 1ec73ad..71da389 100644

[PATCH v5 4/5] teach config --blob option to parse config from database

2013-07-11 Thread Heiko Voigt
This can be used to read configuration values directly from git's database. For example it is useful for reading to be checked out .gitmodules files directly from the database. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- Documentation/git-config.txt | 7 builtin/config.c

[PATCH v5 5/5] do not die when error in config parsing of buf occurs

2013-07-11 Thread Heiko Voigt
in a single revision could be rendered unusable. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- config.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index 75f6ad9..e13a7b6 100644 --- a/config.c +++ b/config.c @@ -21,6 +21,7 @@ struct config_source

Re: RE: [PATCH] git-gui: Modify push dialog to support Gerrit review

2013-09-05 Thread Heiko Voigt
On Thu, Sep 05, 2013 at 09:18:25AM +, Jørgen Edelbo wrote: -Original Message- From: Johannes Sixt [mailto:j.s...@viscovery.net] Sent: 5. september 2013 10:57 Please do not top-post. Am 9/5/2013 10:29, schrieb Jørgen Edelbo: -Original Message- From: Johannes

[PATCH] Let submodule command exit with error status if path does not exist

2012-08-09 Thread Heiko Voigt
piped commands are run in parallel the status code of module_list was swallowed. We work around this by introducing a new function module_list_valid which is used to check the leftover commandline parameters passed to module_list. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- git-submodule.sh

[PATCH v2] Let submodule command exit with error status if path does not exist

2012-08-11 Thread Heiko Voigt
checks for such a submodule specification, exits with 1 and the exit code is propagated. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- On Thu, Aug 09, 2012 at 01:42:20PM -0700, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes: A plausible hack, assuming all the problematic readers

[PATCH] help: correct behavior for is_executable on Windows

2012-08-11 Thread Heiko Voigt
after restart. Signed-off-by: Heiko Voigt heiko.vo...@mahr.de --- help.c | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/help.c b/help.c index 662349d..b41fa21 100644 --- a/help.c +++ b/help.c @@ -103,10 +103,19 @@ static int is_executable(const char *name

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Heiko Voigt
Hi Junio, On Mon, Aug 13, 2012 at 10:48:14AM -0700, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes: What do you think? Does having the stat() help on Windows in any way? Does it ever return an executable bit by itself? No, AFAIK it does not return anything about executability

[PATCH v2] add some bash style we prefer

2012-08-15 Thread Heiko Voigt
During discussion of other patches these preferences have been revealed. Lets add them to the guidelines. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- Here an updated version of the patch. On Tue, Aug 14, 2012 at 02:09:35PM -0700, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Heiko Voigt
Hi Junio, On Wed, Aug 15, 2012 at 10:53:55AM -0700, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes: On Mon, Aug 13, 2012 at 10:48:14AM -0700, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes: What do you think? Does having the stat() help on Windows in any way

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-16 Thread Heiko Voigt
Hi Junio, On Wed, Aug 15, 2012 at 07:02:31PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: My preference is to remove static int is_executable() function from help.c, have an... ... I wouldn't mind seeing the implementation of posix_is_executable() in help.c,

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

2013-06-03 Thread Heiko Voigt
On Mon, Jun 03, 2013 at 11:23:41PM +0100, John Keeping wrote: Sorry, I should have been more specific here. I saw that you did some changes to make submodule add do the right thing with relative paths, but the following change to t7406 does not work like I believe it should but instead

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

2013-06-04 Thread Heiko Voigt
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 wrote: Sorry, I should have been more specific here. I saw that you did some changes to make submodule add do

Re: [PATCH] [submodule] Remove duplicate call to set_rev_name

2013-06-20 Thread Heiko Voigt
Hi, On Mon, Jun 17, 2013 at 11:55:36AM +0200, Fredrik Gustafsson wrote: set_rev_name is a possible expensive operation. If a submodule has changes in it, set_rev_name was called twice. Solution is to move set_rev_name so it's only called once, no matter the codepath taken. Looks good to

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

2013-06-25 Thread Heiko Voigt
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) are huge and you're not really interested in anything but the latest commit. Signed-off-by: Fredrik Gustafsson iv...@iveqy.com I this is a valid use

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

2013-06-28 Thread Heiko Voigt
On Thu, Jun 27, 2013 at 04:54:45PM +0200, Jens Lehmann wrote: Am 26.06.2013 23:03, schrieb Junio C Hamano: Fredrik Gustafsson iv...@iveqy.com 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

Re: why '--init' in git-submodule update

2012-11-05 Thread Heiko Voigt
Hi, On Mon, Nov 05, 2012 at 05:30:51PM +0100, Francis Moreau wrote: I'm wondering why the --init option from git-submodule-update is not at least the defaut. Or even wilder, why this option exists at all and git-submodule-update always behave like --init was always passed. That was a design

Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-09 Thread Heiko Voigt
Hi, On Thu, Nov 08, 2012 at 11:34:54PM -0800, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: By remaining agnostic on the variable usage, this patch makes submodule setup more convenient for all parties. I personally do not think remaining agnostic on the usage is a good

Re: [PATCH v3 2/3] git-submodule foreach: export .gitmodules settings as variables

2012-11-09 Thread Heiko Voigt
Hi, On Thu, Nov 08, 2012 at 10:35:13PM -0500, W. Trevor King wrote: From: W. Trevor King wk...@tremily.us This makes it easy to access per-submodule variables. For example, git submodule foreach 'git checkout $(git config --file $toplevel/.gitmodules submodule.$name.branch) git pull'

[PATCH 0/3] fix cloning superprojects from .

2012-11-13 Thread Heiko Voigt
Hi, On Fri, Nov 09, 2012 at 07:42:26PM +0100, Heiko Voigt wrote: Since this is a change in behaviour I would like to further think about the implications this brings if we fix this. Not sure how many people clone from .. The correct behavior (as documented) is the one you introduce with your

[PATCH 2/3] ensure that relative submodule url needs ./ or ../

2012-11-13 Thread Heiko Voigt
Even though a relative path can be without them the documentation explicitely talks about them. Lets ensure that behavior with a test. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- t/t7400-submodule-basic.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t7400-submodule

[PATCH 1/3] Fix relative submodule setup of submodule tests

2012-11-13 Thread Heiko Voigt
these tests. Later tests expect the submodules origin to be in a directory underneath the tests root. Lets remove the origin from super (which points directly at the tests root directory) to keep these tests expectations. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- t/t7403-submodule-sync.sh

[PATCH 3/3] fix corner case for relative submodule path calculation

2012-11-13 Thread Heiko Voigt
A trailing /. for the superprojects origin is treated as a full path component. This is wrong. Lets add a test and fix this. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- git-submodule.sh | 22 ++ t/t7400-submodule-basic.sh | 44

Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-17 Thread Heiko Voigt
Hi, sorry for the late reply but my git time is limited. On Sat, Nov 10, 2012 at 02:02:32PM -0500, W. Trevor King wrote: On Fri, Nov 09, 2012 at 05:29:27PM +0100, Heiko Voigt wrote: I think we should agree on a behavior for this option and implement it the same time when add learns about

Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-17 Thread Heiko Voigt
Hi, On Sun, Nov 11, 2012 at 10:00:48AM -0500, W. Trevor King wrote: On Sun, Nov 11, 2012 at 02:33:45AM -0800, Junio C Hamano wrote: In order to avoid losing (or creating) local-only submodule commits, I'll probably bail (with an error) on non-fast-forward pulls. Can anyone else think of

Re: Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-17 Thread Heiko Voigt
On Sat, Nov 17, 2012 at 02:20:27PM -0500, W. Trevor King wrote: On Sat, Nov 17, 2012 at 04:30:07PM +0100, Heiko Voigt wrote: (2) git diff [$path] and friends in the superproject compares the HEAD of thecheckout of the submodule at $path with the tip of the branch named

Re: git bash does not access drive f:

2012-11-23 Thread Heiko Voigt
Hi, On Thu, Nov 22, 2012 at 08:07:55AM +0100, Angelo Borsotti wrote: I have attached an external disc, which appears on Windows as drive f: in Windows Explorer. Right-clicking on it displays a context menu showing (among other items) Git Init Here, Git Gui and Git Bash. The first two work

Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-23 Thread Heiko Voigt
On Tue, Nov 20, 2012 at 11:52:46AM -0800, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: The superproject gitlink should only be updated after $ git submodule update --pull A plain $ git submodule update would still checkout the previously-recorded SHA, not

Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-23 Thread Heiko Voigt
On Tue, Nov 20, 2012 at 07:19:12AM -0500, W. Trevor King wrote: The benefit is that Ævar's $ git submodule foreach 'git checkout $(git config --file $toplevel/.gitmodules submodule.$name.branch) git pull' becomes $ git submodule update --pull There is an important question still

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread Heiko Voigt
Hi, On Mon, Nov 26, 2012 at 04:00:15PM -0500, W. Trevor King wrote: From: W. Trevor King wk...@tremily.us On Fri, Nov 23, 2012 at 12:54:02PM -0500, W. Trevor King wrote: We could add $ git submodule update --branch to checkout the gitlinked SHA1 as submodule.name.branch in each of

Re: [PATCH v4 3/4] git-submodule update: Add --branch option

2012-11-27 Thread Heiko Voigt
On Mon, Nov 26, 2012 at 04:00:18PM -0500, W. Trevor King wrote: From: W. Trevor King wk...@tremily.us This allows users to checkout the current superproject-recorded-submodule-sha as a branch, avoiding the detached head state that the standard submodule update creates. This may be useful

Re: Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread Heiko Voigt
Hi, On Tue, Nov 27, 2012 at 02:01:05PM -0500, W. Trevor King wrote: On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: The v4 series leaves the remote branch amigious, but it helps you point the local branch at the right hash so that future calls to $ git submodule foreach 'git

Re: Submodule not updated automatically on merge conflict

2012-12-17 Thread Heiko Voigt
Hi, On Thu, Dec 13, 2012 at 01:46:43PM +0800, ?A???Y wrote: If there are merge conflict files, then changed submodules are not updated automatically. Why not submodules? Files do try to merge / update. This is work in progress, currently you still have to use submodule update to get them in

Re: Re: [PATCH] completion: add option --recurse-submodules to git push

2012-12-18 Thread Heiko Voigt
Hi, sorry for the late reply. On Fri, Dec 07, 2012 at 09:21:33AM -0800, Junio C Hamano wrote: Steffen Jaeckel steffen.jaec...@stzedn.de writes: Signed-off-by: Steffen Jaeckel steffen.jaec...@stzedn.de --- contrib/completion/git-completion.bash | 9 + 1 file changed, 9

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

2012-12-21 Thread Heiko Voigt
Hi, On Wed, Dec 19, 2012 at 11:03:30AM -0500, wk...@tremily.us wrote: From: W. Trevor King wk...@tremily.us Comments on v7 seem to have petered out, so here's v8. Changes since v7: * Series based on gitster/master instead of v1.8.0. * In Documentation/config.txt, restored trailing line

Re: [PATCH v8 1/3] submodule: add get_submodule_config helper funtion

2012-12-21 Thread Heiko Voigt
On Wed, Dec 19, 2012 at 11:03:31AM -0500, wk...@tremily.us wrote: diff --git a/git-submodule.sh b/git-submodule.sh index 2365149..263a60c 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -153,6 +153,32 @@ die_if_unmatched () [...] +get_submodule_config () { + name=$1 +

Re: Re: Change in cvsps maintainership, abd a --fast-export option

2012-12-21 Thread Heiko Voigt
Hi, On Fri, Dec 21, 2012 at 05:44:37AM -0500, Eric S. Raymond wrote: Michael Haggerty mhag...@alum.mit.edu: In 2009 I added tests demonstrating some of the erroneous behavior of git-cvsimport. The failing tests in t9601-t9603 are concrete examples of the problems mentioned in the manpage.

Re: Re: Re: Change in cvsps maintainership, abd a --fast-export option

2012-12-22 Thread Heiko Voigt
Hi, On Sat, Dec 22, 2012 at 01:21:18AM -0500, Eric S. Raymond wrote: Heiko Voigt hvo...@hvoigt.net: Back then when I was converting some repositories to git and I also wrote a quick testsuite for cvsps in an attempt to fix the bugs but gave up. That was the point when I wrote about

Re: Re: Re: Re: Change in cvsps maintainership, abd a --fast-export option

2012-12-23 Thread Heiko Voigt
On Sat, Dec 22, 2012 at 09:15:19AM -0500, Eric S. Raymond wrote: sr@snark:~/WWW/cvsps/fixrepos$ git clone http://repo.or.cz/w/cvsps-hv.git Cloning into 'cvsps-hv'... fatal: http://repo.or.cz/w/cvsps-hv.git/info/refs not valid: is this a git repository? That link refers to the webpage of the

Re: cvsps, parsecvs, svn2git and the CVS exporter mess

2012-12-23 Thread Heiko Voigt
directories. Please share so we can have a look. BTW, where can I find your cvsps code? Anybody who is still interested in this problem should contribute tests. Heiko Voigt, I'd particularly like you in on this. If it does not take to much effort I could port my tests to the new framework. Since

Re: [PATCH] Remove the suggestion to use parsecvs, which is currently broken.

2012-12-28 Thread Heiko Voigt
Hi, On Fri, Dec 28, 2012 at 11:20:25AM -0500, Eric S. Raymond wrote: The parsecvs code has been neglected for a long time, and the only public version does not even build correctly. I have been handed control of the project and intend to fix this, but until I do it cannot be recommended.

Re: Re: [PATCH] Remove the suggestion to use parsecvs, which is currently broken.

2013-01-06 Thread Heiko Voigt
Hi, On Fri, Dec 28, 2012 at 11:42:00PM -0500, Eric S. Raymond wrote: Heiko Voigt hvo...@hvoigt.net: Maybe you could add that information to the parsecvs compile instructions? I think just because it takes some effort to compile does not justify to remove this useful pointer here. When I

Re: sha1 information is lacking or useless when rebasing with a submodule pointer conflict

2013-01-30 Thread Heiko Voigt
Hi, On Wed, Jan 30, 2013 at 12:43:31PM -0600, Michael Sims wrote: I'm seeing what might be a bug that was introduced in git 1.7.12 (also observed in 1.8.1.2). If not a bug, it's a changed behavior from previous versions that I don't understand. Here's the scenario: * I have a remote repo

Re: Re: sha1 information is lacking or useless when rebasing with a submodule pointer conflict

2013-01-30 Thread Heiko Voigt
Hi, On Wed, Jan 30, 2013 at 10:56:15PM +0100, Heiko Voigt wrote: On Wed, Jan 30, 2013 at 12:43:31PM -0600, Michael Sims wrote: I'm seeing what might be a bug that was introduced in git 1.7.12 (also observed in 1.8.1.2). If not a bug, it's a changed behavior from previous versions that I

[RFC/WIP PATCH 0/3] fetch moved submodules on-demand

2013-02-24 Thread Heiko Voigt
. Let me know what you think. Cheers Heiko Heiko Voigt (3): teach config parsing to read from strbuf implement fetching of moved submodules submodule: simplify decision tree whether to or not to fetch .gitignore | 1 + Makefile| 2 + cache.h

[RFC/WIP PATCH 1/3] teach config parsing to read from strbuf

2013-02-24 Thread Heiko Voigt
This can be used to read configuration values directly from gits database. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- .gitignore | 1 + Makefile | 1 + cache.h| 1 + config.c | 119

[RFC/WIP PATCH 2/3] implement fetching of moved submodules

2013-02-24 Thread Heiko Voigt
using the null sha1. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- Makefile| 1 + submodule-config-cache.c| 96 ++ submodule-config-cache.h| 34 submodule.c | 196 ++-- t/t5526

[RFC/WIP PATCH 3/3] submodule: simplify decision tree whether to or not to fetch

2013-02-24 Thread Heiko Voigt
To make extending this logic later easier. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- submodule.c | 50 +++--- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/submodule.c b/submodule.c index b603000..a6fe16e 100644

Re: [RFC/WIP PATCH 1/3] teach config parsing to read from strbuf

2013-02-25 Thread Heiko Voigt
Hi Junio, On Sun, Feb 24, 2013 at 09:54:43PM -0800, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes: diff --git a/config.c b/config.c index aefd80b..f995e98 100644 --- a/config.c +++ b/config.c @@ -13,6 +13,9 @@ typedef struct config_file { struct config_file

[PATCH 0/4] allow more sources for config values

2013-02-26 Thread Heiko Voigt
about making it a seperate topic and implement this infrastructure first? Junio I incorporated your comments this seems like a result ready for inclusion. [1] http://article.gmane.org/gmane.comp.version-control.git/217018 [2] http://article.gmane.org/gmane.comp.version-control.git/217155 Heiko

[PATCH 3/4] config: make parsing stack struct independent from actual data source

2013-02-26 Thread Heiko Voigt
. A new source can use this to store its custom data. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- config.c | 57 - 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/config.c b/config.c index f55c43d..19aa205 100644

[PATCH 4/4] teach config parsing to read from strbuf

2013-02-26 Thread Heiko Voigt
This can be used to read configuration values directly from gits database. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- .gitignore | 1 + Makefile | 1 + cache.h| 1 + config.c | 47 +++ t

[PATCH 2/4] config: drop file pointer validity check in get_next_char()

2013-02-26 Thread Heiko Voigt
The only location where cf is set in this file is in do_config_from(). This function has only one callsite which is config_from_file(). In config_from_file() its ensured that the f member is set to non-zero. Signed-off-by: Heiko Voigt hvo...@hvoigt.net --- config.c | 4 ++-- 1 file changed, 2

Re: [PATCH 1/4] config: factor out config file stack management

2013-02-26 Thread Heiko Voigt
On Tue, Feb 26, 2013 at 02:54:49PM -0500, Jeff King wrote: On Tue, Feb 26, 2013 at 08:38:50PM +0100, Heiko Voigt wrote: +static int do_config_from(struct config_file *top, config_fn_t fn, void *data) +{ + int ret; + + /* push config-file parsing state stack */ + top-prev = cf

Re: [PATCH 1/4] config: factor out config file stack management

2013-02-26 Thread Heiko Voigt
On Tue, Feb 26, 2013 at 02:10:03PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: I wonder if it would be more obvious with the more usual OO-struct functions, like: struct config_source { ... }; void config_source_init_file(struct config_source *,

Re: [PATCH 2/4] config: drop file pointer validity check in get_next_char()

2013-02-26 Thread Heiko Voigt
On Tue, Feb 26, 2013 at 03:05:56PM -0500, Jeff King wrote: On Tue, Feb 26, 2013 at 08:40:23PM +0100, Heiko Voigt wrote: The only location where cf is set in this file is in do_config_from(). This function has only one callsite which is config_from_file(). In config_from_file() its ensured

Re: [PATCH 1/4] config: factor out config file stack management

2013-02-26 Thread Heiko Voigt
On Tue, Feb 26, 2013 at 02:12:23PM -0800, Junio C Hamano wrote: Heiko Voigt hvo...@hvoigt.net writes: The do_config_from means parse from whatever is in 'top'. Later in the series its type changes from config_file to struct config. Yuck. It would be nice to have it as struct config_src

  1   2   3   4   >