diff options
| author |  Jeff King <peff@peff.net> | 2013-04-04 15:03:58 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-04 12:28:53 -0700 |
| commit | 96ec8ee92aad52b6556e87d0166a7b9c4cd7c324 (patch) | |
| tree | d6981aa8c30e895a8c5cb06910a363c79db3326a /Documentation/git-send-email.txt | |
| parent | rm: do not complain about d/f conflicts during deletion (diff) | |
| download | tgif-96ec8ee92aad52b6556e87d0166a7b9c4cd7c324.tar.xz | |
t3600: test behavior of reverse-d/f conflict
The previous commit taught "rm" that it is safe to consider
"d/f" removed when "d" has become a non-directory. This
patch adds a test for the opposite: a file "d" that becomes
a directory.
In this case, "git rm" does need to complain, because we
should not be removing arbitrary content under "d". Git
already behaves correctly, but let's make sure that remains
the case by protecting the behavior with a test.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-send-email.txt')
0 files changed, 0 insertions, 0 deletions