On Sat, Nov 27, 2021 at 6:00 AM Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > > On Fri, Nov 26 2021, Elijah Newren via GitGitGadget wrote: > > [Just some more "I haven't really looked at this in all that much > detail" commentary, so maybe it's stupid, sorry] > > > From: Elijah Newren <newren@xxxxxxxxx> > > > > Removing the current working directory causes all subsequent git > > commands run from that directory to get confused and fail with a message > > about being unable to read the current working directory: > > > > $ git status > > fatal: Unable to read current working directory: No such file or directory > > > > Non-git commands likely have similar warnings or even errors, e.g. > > > > $ bash -c 'echo hello' > > shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory > > hello > > Is that really realistic? I have 321 shell scripts (or symlinks thereto) in /usr/bin/ on my Fedora laptop, and 951 shell scripts in /usr/bin/ on my Ubuntu workstation at $DAYJOB. That's not even considering stuff in other directories. Note that I didn't place any of those scripts in /usr/bin/; they came from the distribution and/or corporate packages from others. Any invocation of bash will see the above "error" message. Granted, bash calls it an 'error' but continues anyway, but I thought it showed that there were clearly programs besides git where users could run into problems. > Any "normal" command would use "pwd" or look > at $PWD, both of which "work", this error is only because we're starting > a new shell. <grin> Yeah, good point. Who would use an unusual program like git? Or a shell script? Or a java program? Or emacs? Or other programs like them? Besides, git, bash, java, and emacs are all relatively young commands with small development teams. Maybe we should just rely on users only using commands that get the pwd/$PWD detail right; perhaps limiting to commands that are more mature and have bigger development teams than those four. Silly users. ;-) Sorry, couldn't resist a little friendly teasing. However, for "pwd"...by "work", do you mean "doesn't necessarily work"? On my machine: $ mkdir gone $ cd gone $ rmdir ../gone $ pwd -P pwd: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory $ pwd pwd: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory $ echo $PWD /home/newren/floss/git/gone If I do not run `pwd -P` first then a plain `pwd` works. But your advice to use `pwd` seems misguided for programs, since they'll hit this problem if users have run a previous `pwd -P`. (The $PWD trick would have worked, as shown above) > I wonder if it was just because you ran into our bin-wrappers edge case, > but that should be really obscure for any real users. Yes, I agree our bin-wrappers is a really obscure edge case not worth considering. I don't see how you jump from there to painting all shell scripts combined with the same brush, though. > > This confuses end users, particularly since the command they get the > > error from is not the one that caused the problem; the problem came from > > the side-effect of some previous command. > > > > We would like to avoid removing the current working directory of our > > parent process; towards this end, introduce a new variable, > > startup_info->original_cwd, that tracks the current working directory > > that we inherited from our parent process. For convenience of later > > comparisons, we prefer that this new variable store a path relative to > > the toplevel working directory (thus much like 'prefix'), except without > > the trailing slash. > > I'm still not clear at all on why we need a "original_cwd" at all then > as opposed to just using "prefix" (or adding "the_prefix" if passing it > down is painful). I.e. we discover our relative path, we resolve the > relative path to the root, can't we use that as the "don't remove our > CWD" guard? > > Does our prefix change at some point, then maybe "orig_prefix" would > make more sense? No; see the code comment in the same patch: + /* + * startup_info->original_cwd points to the current working + * directory we inherited from our parent process, which is a + * directory we want to avoid removing. + * + * For convience, we would like to have the path relative to the + * worktree instead of an absolute path. + * + * Yes, startup_info->original_cwd is usually the same as 'prefix', + * but differs in two ways: + * - prefix has a trailing '/' + * - if the user passes '-C' to git, that modifies the prefix but + * not startup_info->original_cwd. + */ It's never equal to prefix, even though it's usually semantically referring to the same directory. However, even if it weren't for the trailing slash issue, the -C case means it is not appropriate to think of it as "orig_prefix" either.
