Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'en/unpack-trees-split-index-fix'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 23 May 2018 05:38:22 +0000
(14:38 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 23 May 2018 05:38:22 +0000
(14:38 +0900)
The split-index feature had a long-standing and dormant bug in
certain use of the in-core merge machinery, which has been fixed.
* en/unpack-trees-split-index-fix:
unpack_trees: fix breakage when o->src_index != o->dst_index
1
2
unpack-trees.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
6b0f1d9
7db1183
)
diff --cc
unpack-trees.c
Simple merge