mirror of https://github.com/git/git.git
checkout_entry(): remove unreachable error() call
This if statement never evaluates to true since we already check state->force a few lines above, and immediately return when it is false. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
47ae905ffb
commit
748f733d54
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 it is a gitlink, leave it alone! */
|
||||||
if (S_ISGITLINK(ce->ce_mode))
|
if (S_ISGITLINK(ce->ce_mode))
|
||||||
return 0;
|
return 0;
|
||||||
if (!state->force)
|
|
||||||
return error("%s is a directory", path.buf);
|
|
||||||
remove_subtree(&path);
|
remove_subtree(&path);
|
||||||
} else if (unlink(path.buf))
|
} else if (unlink(path.buf))
|
||||||
return error_errno("unable to unlink old '%s'", path.buf);
|
return error_errno("unable to unlink old '%s'", path.buf);
|
||||||
|
|
Loading…
Reference in New Issue