diff options
| author |  Ben Wijen <ben@wijen.net> | 2020-07-10 10:47:32 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-07-10 11:43:29 -0700 |
| commit | dfaa209a79a831e8ff4f6b8e14a8b0c35b4f6b6e (patch) | |
| tree | f20e0b5a062deec373346cb6782f6757eac132e1 /builtin/merge-ours.c | |
| parent | The sixth batch (diff) | |
| download | tgif-dfaa209a79a831e8ff4f6b8e14a8b0c35b4f6b6e.tar.xz | |
git clone: don't clone into non-empty directory
When using git clone with --separate-git-dir realgitdir and
realgitdir already exists, it's content is destroyed.
So, make sure we don't clone into an existing non-empty directory.
When d45420c1 (clone: do not clean up directories we didn't create,
2018-01-02) tightened the clean-up procedure after a failed cloning
into an empty directory, it assumed that the existing directory
given is an empty one so it is OK to keep that directory, while
running the clean-up procedure that is designed to remove everything
in it (since there won't be any, anyway). Check and make sure that
the $GIT_DIR is empty even cloning into an existing repository.
Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions