]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 929c097 9da2d03)
Merge branch 'en/rename-directory-detection'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:44 +0000 (10:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:44 +0000 (10:18 -0700)
commitf72432d64ebc4fea80265114464ddb7b25ce9633
tree55cbf9cbf94453a90be00ccbb36fb1a37f9d6f73tree | snapshot
parent929c0975482e78c4bd680b010a8ceac6c31160a0commit | diff
parent9da2d0379ea0220dd670d70b8af571a2a09b3c12commit | 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
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.