diff options
| author |  Clemens Buchacher <drizzd@aon.at> | 2010-10-09 15:53:00 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-13 14:34:09 -0700 |
| commit | f66caaf9c8e0feb840a439a58e165b963aec79cf (patch) | |
| tree | 0c0f99ba5a023b7330b949045ba188e3a7cc1fde /t | |
| parent | lstat_cache: optionally return match_len (diff) | |
| download | tgif-f66caaf9c8e0feb840a439a58e165b963aec79cf.tar.xz | |
do not overwrite files in leading path
If the work tree contains an untracked file x, and
unpack-trees wants to checkout a path x/*, the
file x is removed unconditionally.
Instead, apply the same checks that are normally
used for untracked files, and abort if the file
cannot be removed.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 77fcaa2e31..e49dd8023c 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -100,7 +100,7 @@ test_expect_success 'will not overwrite untracked subtree' ' test_cmp important sub/f/important ' -test_expect_failure 'will not overwrite untracked file in leading path' ' +test_expect_success 'will not overwrite untracked file in leading path' ' git reset --hard c0 && rm -rf sub && cp important sub && |