diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-08 20:13:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-08 20:13:14 (GMT) |
| commit | 1b53bea29aa836932ed6e00383dd6113721c1a73 (patch) | |
| tree | 9bf53f9f5ec33383efca6f371a557b2b7e5cb8fe /bulk-checkin.c | |
| parent | 6c5fbd866c89d939d6202a2594658234d4cf1e90 (diff) | |
| parent | 32ed3314c104733ea27e06a82efae569dacd825a (diff) | |
| download | git-1b53bea29aa836932ed6e00383dd6113721c1a73.zip git-1b53bea29aa836932ed6e00383dd6113721c1a73.tar.gz git-1b53bea29aa836932ed6e00383dd6113721c1a73.tar.bz2 | |
Merge branch 'js/t5351-freebsd-fix'
Some tests assumed that core.fsyncMethod=batch is supported
everywhere, which broke FreeBSD.
* js/t5351-freebsd-fix:
t5351: avoid using `test_cmp` for binary data
t5351: avoid relying on `core.fsyncMethod = batch` to be supported
Diffstat (limited to 'bulk-checkin.c')
| -rw-r--r-- | bulk-checkin.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index 98ec893..855b68e 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -340,6 +340,8 @@ void fsync_loose_object_bulk_checkin(int fd, const char *filename) */ if (!bulk_fsync_objdir || git_fsync(fd, FSYNC_WRITEOUT_ONLY) < 0) { + if (errno == ENOSYS) + warning(_("core.fsyncMethod = batch is unsupported on this platform")); fsync_or_die(fd, filename); } } |