Merge branch 'en/keep-cwd'
commitda81d473fcfa67dfbcf0504d2b5225885e51e532
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2022 22:01:28 +0000 (5 14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2022 22:01:28 +0000 (5 14:01 -0800)
tree69f054e9d22dac00cf4b68705f3ab28dbb51a0b2
parentd0c99fcc618fc71cff261246b9d5605cbd225329
parent324b170b88475811cb0506a30b4710ffc89ae936
Merge branch 'en/keep-cwd'

Many git commands that deal with working tree files try to remove a
directory that becomes empty (i.e. "git switch" from a branch that
has the directory to another branch that does not would attempt
remove all files in the directory and the directory itself).  This
drops users into an unfamiliar situation if the command was run in
a subdirectory that becomes subject to removal due to the command.
The commands have been taught to keep an empty directory if it is
the directory they were started in to avoid surprising users.

* en/keep-cwd:
  t2501: simplify the tests since we can now assume desired behavior
  dir: new flag to remove_dir_recurse() to spare the original_cwd
  dir: avoid incidentally removing the original_cwd in remove_path()
  stash: do not attempt to remove startup_info->original_cwd
  rebase: do not attempt to remove startup_info->original_cwd
  clean: do not attempt to remove startup_info->original_cwd
  symlinks: do not include startup_info->original_cwd in dir removal
  unpack-trees: add special cwd handling
  unpack-trees: refuse to remove startup_info->original_cwd
  setup: introduce startup_info->original_cwd
  t2501: add various tests for removing the current working directory
builtin/stash.c
cache.h
common-main.c
dir.c
sequencer.c
unpack-trees.c