On 09/27, Junio C Hamano wrote: > > What we internally call "prefix" and "--submodule-prefix" is closely > > related in that they both interact with pathspecs. "prefix" gets > > prepended to elements of an end-user supplied pathspec before a > > full-path-in-the-repository (i.e. a path in the index and a path > > relative from the top of the working tree) is matched against them. > > In a sense, this new thing is a superset of the existing GIT_PREFIX, > which gives the current working directory from the end user's point > of view relative to the actual current working directory. The "git" > wrapper, when running a "git thing" from a subdirectory of a working > tree, chdir(2)s up to the top-level before spawning the "thing" > subcommand that is not built-in or a third-party "git-thing" binary > on user's $PATH; so "git-thing" binary will be told via $GIT_PREFIX > relative to what directory path-like things the end user supplied to > the command (e.g. "-o outfile" argument and pathspecs) need to be > interpreted. The new thing can override the $GIT_PREFIX to allow > path-like things to be interpreted relative to somewhere _above_ the > top-level of the working tree. > > I am tempted to suggest GIT_SUPER_PREFIX, 50% because I cannot think > of any better word, 40% because I think it actually makes sense (in > the sense that this comes _above_ it, hence "super", and also in the > sense that this is something your "super" project would give you), > and 10% because I hope that being ridiculous would nudge people to > come up with a better alternative ;-) haha, yeah it seems difficult to come up with a name that is going to mean the same thing in 5 years from now. At least GIT_SUPER_PREFIX makes senese in that it is a path from the superproject down to the submodule. > > * It is unclear how this should interact with commands that are run > > in a subdirectory of the working tree. E.g. what should the > > prefix and the pathspec look like if the command in the above > > example is started in w/git.git/Documentation subdirectory, i.e. > > > > $ cd ~ > > $ git -C w/git.git/Documentation ls-files \ > > --submodule-prefix=??????? -- '???????' | > > xargs ls -1 -l > > > > Should we error out if we are not at the top of the working tree > > when --submodule-prefix is given? > > ... the answer to this question becomes clear. It is not possible > to _be_ in a subdirectory "Documentation" of this working tree and > in a directory "~" above this working tree at the same time, so we > simply should forbid running the command from anywhere other than > the top of the working tree (i.e. the internal "prefix" and > GIT_PREFIX must be empty) when the super-prefix is set by erroring > it out. When we realize that "prefix" adds to the paths that are > supplied by the user (e.g. when the user says Makefile while in t/ > subdirectory, i.e. GIT_PREFIX=t/, s/he means t/Makefile), but this > new thing subtracts from the paths given by the user (e.g. when the > user gives a pathspec 'w/git.git/D*' while setting the super thing > as w/git.git, because s/he is at ~/, the pathspec matcher > conceptually subtracts w/git.git/ from the pathspec before matching > them against the paths it finds in the index), it becomes clear that > giving both at the same time is awkward and not very useful. Well maybe...I don't really know much about how the prefix interacts in every scenario but would what you describe still work if we are in a sub dir of the superproject (which contains other directorys and perhaps a submodule) and execute a --recurse-submodules command in the subdirectory? I suspect we don't want to force users to be in the root directory of the project in order to use --recurse-submodules. -- Brandon Williams