mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'mt/checkout-entry-dead-code-removal'
Code clean-up. * mt/checkout-entry-dead-code-removal: checkout_entry(): remove unreachable error() call
This commit is contained in:
commit
43c80d2703
2
entry.c
2
entry.c
|
@ -510,8 +510,6 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state,
|
|||
/* If it is a gitlink, leave it alone! */
|
||||
if (S_ISGITLINK(ce->ce_mode))
|
||||
return 0;
|
||||
if (!state->force)
|
||||
return error("%s is a directory", path.buf);
|
||||
remove_subtree(&path);
|
||||
} else if (unlink(path.buf))
|
||||
return error_errno("unable to unlink old '%s'", path.buf);
|
||||
|
|
Loading…
Reference in a new issue