projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c97268c deb9c15)
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)
commitd0b6966e3dc0a1aca8b7aa89dd0f95cda50d21f2
tree180fba4d17eac6d8cdc52d80ecc99edae01cd2abtree | snapshot
parentc97268c822077ba414f90f6ba357fab170bb3986commit | diff
parentdeb9c1575c456b9d12ff05fdd2bec516dfb34ae4commit | diff
Merge branch 'rs/notes-merge-no-toctou'

"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
notes-merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.