diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:11 -0800 |
| commit | da07df3ee3ff8c9d676db6be04a76ead1d9919d8 (patch) | |
| tree | ac1af8bb8c69573847fb454fd6c603ab7e1ee674 /merge.c | |
| parent | Merge branch 'nd/exclusion-regression-fix' into maint (diff) | |
| parent | Handle more file writes correctly in shared repos (diff) | |
| download | tgif-da07df3ee3ff8c9d676db6be04a76ead1d9919d8.tar.xz | |
Merge branch 'js/fopen-harder' into maint
Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
(e.g. COMMIT_EDITMSG) that is meant to be left after the command is
done. This however did not work well if the repository is set to
be shared with core.sharedRepository and the umask of the previous
user is tighter. They have been made to work better by calling
unlink(2) and retrying after fopen(3) fails with EPERM.
* js/fopen-harder:
Handle more file writes correctly in shared repos
commit: allow editing the commit message even in shared repos
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions