Skip to content

Commit

Permalink
unpack-trees: simplify verify_absent_sparse()
Browse files Browse the repository at this point in the history
verify_absent_sparse() was introduced in commit 08402b0
("merge-recursive: distinguish "removed" and "overwritten" messages",
2010-08-11), and has always had exactly one caller which always passes
error_type == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN.  This function
then checks whether error_type is this value, and if so, sets it instead
to ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN.  It has been nearly a decade
and no other caller has been created, and no other value has ever been
passed, so just pass the expected value to begin with.

Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
newren authored and gitster committed Mar 27, 2020
1 parent d7dc1e1 commit d61633a
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions unpack-trees.c
Expand Up @@ -506,7 +506,7 @@ static int apply_sparse_checkout(struct index_state *istate,
ce->ce_flags &= ~CE_UPDATE;
}
if (was_skip_worktree && !ce_skip_worktree(ce)) {
if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, o))
return -1;
ce->ce_flags |= CE_UPDATE;
}
Expand Down Expand Up @@ -2026,11 +2026,7 @@ static int verify_absent_sparse(const struct cache_entry *ce,
enum unpack_trees_error_types error_type,
struct unpack_trees_options *o)
{
enum unpack_trees_error_types orphaned_error = error_type;
if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;

return verify_absent_1(ce, orphaned_error, o);
return verify_absent_1(ce, error_type, o);
}

static int merged_entry(const struct cache_entry *ce,
Expand Down

0 comments on commit d61633a

Please sign in to comment.