diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:59 +0900 |
| commit | 9e3dc6bfb2756f9da7ddb64a1d9e41a22aa11e9b (patch) | |
| tree | 352407e77e35633cd1a63cca1c6d05275cb5f323 /builtin/merge-ours.c | |
| parent | Merge branch 'ab/rebase-in-c-escape-hatch' (diff) | |
| parent | bundle: dup() output descriptor closer to point-of-use (diff) | |
| download | tgif-9e3dc6bfb2756f9da7ddb64a1d9e41a22aa11e9b.tar.xz | |
Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'
When "git bundle" aborts due to an empty commit ranges
(i.e. resulting in an empty pack), it left a file descriptor to an
lockfile open, which resulted in leftover lockfile on Windows where
you cannot remove a file with an open file descriptor. This has
been corrected.
* jk/close-duped-fd-before-unlock-for-bundle:
bundle: dup() output descriptor closer to point-of-use
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions