Merge branch 'rs/notes-merge-no-toctou'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:41 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:41 +0000 (10:34 -0700)
"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

1  2 
notes-merge.c
diff --cc notes-merge.c
Simple merge