From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Jan 2017 23:24:26 +0000 (-0800)
Subject: Merge branch 'jc/git-open-cloexec'
X-Git-Tag: v2.12.0-rc0~86
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02d0457eb4b9bf656965c5dbb613b8bfaef3316f

Merge branch 'jc/git-open-cloexec'

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
---

02d0457eb4b9bf656965c5dbb613b8bfaef3316f
diff --cc sha1_file.c
index 1173071859,4e062edea0..1eb47f6113
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -26,16 -26,7 +26,8 @@@
  #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; }