diff options
author | Calvin Wan <calvinwan@google.com> | 2023-09-30 00:20:49 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-09-30 01:14:56 +0300 |
commit | afd2a1d5f1fc371fe1fda0ed07e0f2f27100fbab (patch) | |
tree | b13a88a44ba897c7f087a01be7743de3a310d2b5 /entry.c | |
parent | d88e8106e892109f4f4b13312dd026d0a7fcfeec (diff) |
wrapper: reduce scope of remove_or_warn()
remove_or_warn() is only used by entry.c and apply.c, but it is
currently declared and defined in wrapper.{h,c}, so it has a scope much
greater than it needs. This needlessly large scope also causes wrapper.c
to need to include object.h, when this file is largely unconcerned with
Git objects.
Move remove_or_warn() to entry.{h,c}. The file apply.c still has access
to it, since it already includes entry.h for another reason.
Signed-off-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'entry.c')
-rw-r--r-- | entry.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -581,3 +581,8 @@ void unlink_entry(const struct cache_entry *ce, const char *super_prefix) return; schedule_dir_for_removal(ce->name, ce_namelen(ce)); } + +int remove_or_warn(unsigned int mode, const char *file) +{ + return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file); +} |