Re: [PATCH 0/5] Fix 'url.*.insteadOf' for submodule URLs
On Monday 04 August 2008, Junio C Hamano wrote:
Show 11 quoted lines
> Johan Herland <johan@herland.net> writes:
> > 1. Consistency: Other git commands in the supermodule does _not_
> > require the URL rewriting rule to reside in the global config. Why
> > should 'git submodule' be different.
>
> When it comes to "submodules", I do not think such consistency argument
> makes much sense. "git submodule" command crosses module boundary,
> normal commands don't. They are naturally different and they should be.
>
> Your kind of consistency means breaking the separation between module
> boundary, doesn't it?
To a certain degree, yes, but (1) only for this specific config rule (url.*.insteadOf), and (2) only at the specific point in time when the submodule is cloned. This means that after the submodule is cloned, it is indeed not affected by the super-repo's config. E.g. you can change the origin URL of the submodule back to the original (un-rewritten) URL in the submodule's config, and the super-repo will not try to rewrite it at again.
I believe that the module boundary should not be crossed in general. But this patch only "crosses" that boundary before it really exists (i.e. before the submodule has been cloned into the super-repo). The event of introducing a submodule into a super-repo, is AFAICS the _only_ event where I would consider to cross the module boundary (and then only for a good reason).
Show 10 quoted lines
> Having said that...
>
> > 2. I believe there are valid use cases for adding URL rewriting rules
> > to the repo config instead of the global config. You may want to check
> > out Fred's version of project X (including submodules), without making
> > your other clones of project X start cloning/fetching from Fred.
>
> I think you are referring to the example given in an earlier thread to
> peek what your neighbor did between you two, without affecting other
> people.
Show 5 quoted lines
> Personally I think it is partly showing the shortcoming of the current
> "git submodule" that minimally supports the workflow to follow what the
> canonical repository does, and partly showing that it is an abuse of that
> interface to rewrite config file to temporarily switch to peek somewhere
> else in such a workflow.
Indeed. However, the development of submodules usability seems so slow that even though this use case is an ugly workaround, it's one I thought we'd have to live with for some time... [1]
Show 25 quoted lines
> Let's step back and think what we would do if there is no submodule
> involved. That is, you usually follow origin, but you temporarily want
> to peek at what Fred did. How would you do this?
>
> $ git fetch $fred $branch_fred_wants_you_to_review
> $ git checkout FETCH_HEAD ;# this detaches HEAD.
>
> And you take a look around. Perhaps you like the change and decide to
> merge that to your branch. Perhaps you create your own branch on top of
> that state, build a few fix-up commits, and give the result back to Fred.
>
> Shouldn't peeking what Fred did in the whole submodule hierarchy be
> essentially the same thing? That is,
>
> $ git submodule for-each-submodule sh -c '
> git fetch "$fred/$1" $branch_fred_wants_you_to_review &&
> git checkout FETCH_HEAD
> ' -
>
> where "for-each-submodule" would iterate over the submodules in the
> current superproject that you are interested in (that is, you actually
> have corresponding repositories there), and runs any given command with
> the path to the submodule in that directory.
>
> Hmm?
Yes, having such functionality in 'git submodule' would be wonderful. However, implementations of such functionality have been slow in coming, and apparently hard to implement without being workflow-agnostic (if I remember correctly).
In light of improvements to 'git submodule', feel free to disregard my patch series (although I still find 'git config --rewrite-url' useful for dry-testing my 'url.*.insteadOf' rules...).
Thanks for providing constructive feedback.
Have fun!
...Johan
[1]: Maybe 'git submodule' would improve more quickly if we ate our own dogfood, i.e. if we included submodules (e.g. gitk and git-gui) in git.git?
--
Johan Herland, <johan@herland.net>
www.herland.net
Johan Herland
