diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-30 16:38:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-30 16:38:58 -0700 |
| commit | 7eb91521fd0a8337c99fdb40586b90355b6669ac (patch) | |
| tree | e9b02e5f8ce5230294266972a2f5e6bb2d35c55a /cache.h | |
| parent | 47b6d90e91835082010da926f6a844d4441c57a6 (diff) | |
| parent | 1991703bdbb7839e3b43e0e0238f8efd76c8fe8d (diff) | |
| download | git-7eb91521fd0a8337c99fdb40586b90355b6669ac.tar.xz | |
Merge branch 'jc/fix-2.45.1-and-friends-for-2.39' into maint-2.39
* jc/fix-2.45.1-and-friends-for-2.39:
Revert "fsck: warn about symlink pointing inside a gitdir"
Revert "Add a helper function to compare file contents"
clone: drop the protections where hooks aren't run
tests: verify that `clone -c core.hooksPath=/dev/null` works again
Revert "core.hooksPath: add some protection while cloning"
init: use the correct path of the templates directory again
hook: plug a new memory leak
ci: stop installing "gcc-13" for osx-gcc
ci: avoid bare "gcc" for osx-gcc job
ci: drop mention of BREW_INSTALL_PACKAGES variable
send-email: avoid creating more than one Term::ReadLine object
send-email: drop FakeTerm hack
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -1785,20 +1785,6 @@ int copy_fd(int ifd, int ofd); int copy_file(const char *dst, const char *src, int mode); int copy_file_with_time(const char *dst, const char *src, int mode); -/* - * Compare the file mode and contents of two given files. - * - * If both files are actually symbolic links, the function returns 1 if the link - * targets are identical or 0 if they are not. - * - * If any of the two files cannot be accessed or in case of read failures, this - * function returns 0. - * - * If the file modes and contents are identical, the function returns 1, - * otherwise it returns 0. - */ -int do_files_match(const char *path1, const char *path2); - void write_or_die(int fd, const void *buf, size_t count); void fsync_or_die(int fd, const char *); int fsync_component(enum fsync_component component, int fd); |
