diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-10 11:39:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-10 11:39:14 -0700 |
| commit | a7a2d10421b735944f376f1de53b437bfbb93e88 (patch) | |
| tree | 7004d754ae7d6fc1e51820f556d0570da835e42c /wrapper.c | |
| parent | 3df51ea0a5ef88b801ab30ca28f159b898183926 (diff) | |
| parent | b1bda751739d90e1a94b47397676bcb8eebf16d5 (diff) | |
| download | git-a7a2d10421b735944f376f1de53b437bfbb93e88.tar.gz | |
Merge branch 'cw/prelim-cleanup'
Shuffle some bits across headers and sources to prepare for
libification effort.
* cw/prelim-cleanup:
parse: separate out parsing functions from config.h
config: correct bad boolean env value error message
wrapper: reduce scope of remove_or_warn()
hex-ll: separate out non-hash-algo functions
Diffstat (limited to 'wrapper.c')
| -rw-r--r-- | wrapper.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -3,9 +3,8 @@ */ #include "git-compat-util.h" #include "abspath.h" -#include "config.h" +#include "parse.h" #include "gettext.h" -#include "object.h" #include "repository.h" #include "strbuf.h" #include "trace2.h" @@ -632,11 +631,6 @@ int rmdir_or_warn(const char *file) return warn_if_unremovable("rmdir", file, rmdir(file)); } -int remove_or_warn(unsigned int mode, const char *file) -{ - return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file); -} - static int access_error_is_ok(int err, unsigned flag) { return (is_missing_file_error(err) || |