]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/git-open-cloexec'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:24:26 +0000 (15:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:24:26 +0000 (15:24 -0800)
The codeflow of setting NOATIME and CLOEXEC on file descriptors Git
opens has been simplified.
We may want to drop the tip one, but we'll see.

* jc/git-open-cloexec:
  sha1_file: stop opening files with O_NOATIME
  git_open_cloexec(): use fcntl(2) w/ FD_CLOEXEC fallback
  git_open(): untangle possible NOATIME and CLOEXEC interactions

1  2 
cache.h
read-cache.c
sha1_file.c

diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc sha1_file.c
index 1173071859dae68f72cc72efb20f816152d3eabc,4e062edea0f52912dc22626990c90328bf0a7502..1eb47f61131a81b587dc4fe80e1b175f37ba0540
  #include "mru.h"
  #include "list.h"
  #include "mergesort.h"
 +#include "quote.h"
  
- #ifndef O_NOATIME
- #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
- #define O_NOATIME 01000000
- #else
- #define O_NOATIME 0
- #endif
- #endif
  #define SZ_FMT PRIuMAX
  static inline uintmax_t sz_fmt(size_t s) { return s; }