]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a52fb9b deb9c15)
Merge branch 'rs/notes-merge-no-toctou' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:35 +0000 (14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:35 +0000 (14:21 -0700)
commit743fba85f7dfb04eff4df55dc8d7aa08f3f8eaa3
treee2aa879bce2c875e7268fb35b50d0287ed505fd3tree | snapshot
parenta52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5dcommit | diff
parentdeb9c1575c456b9d12ff05fdd2bec516dfb34ae4commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.