From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:21:35 +0000 (-0700)
Subject: Merge branch 'rs/notes-merge-no-toctou' into maint
X-Git-Tag: v2.9.3~40
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/743fba85f7dfb04eff4df55dc8d7aa08f3f8eaa3

Merge branch 'rs/notes-merge-no-toctou' into maint

"git notes merge" had a code to see if a path exists (and fails if
it does) and then open the path for writing (when it doesn't).
Replace it with open with O_EXCL.

* rs/notes-merge-no-toctou:
notes-merge: use O_EXCL to avoid overwriting existing files
---

743fba85f7dfb04eff4df55dc8d7aa08f3f8eaa3