diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:44 -0700 |
| commit | f72432d64ebc4fea80265114464ddb7b25ce9633 (patch) | |
| tree | 55cbf9cbf94453a90be00ccbb36fb1a37f9d6f73 /merge-blobs.c | |
| parent | 929c0975482e78c4bd680b010a8ceac6c31160a0 (diff) | |
| parent | 9da2d0379ea0220dd670d70b8af571a2a09b3c12 (diff) | |
Merge branch 'en/rename-directory-detection'
Newly added codepath in merge-recursive had potential buffer
overrun, which has been fixed.
* en/rename-directory-detection:
merge-recursive: use xstrdup() instead of fixed buffer
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions