Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'en/rename-directory-detection'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 18 Jun 2018 17:18:44 +0000
(10:18 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 18 Jun 2018 17:18:44 +0000
(10:18 -0700)
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
1
2
merge-recursive.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
929c097
9da2d03
)
diff --cc
merge-recursive.c
Simple merge