mirrors/jgit - jgit - source @ dussan.org

История

Christian Halstrick 3c544647b7 Fix ResolveMerger not to add paths with FileMode 0 When ResolveMerger finds a path where it has to do a content merge it will try the content merge and if that succeeds it'll add the newly produced content to the index. For the FileMode of this new index entry it blindly copies the FileMode it finds for that path in the common base tree. If by chance the common base tree does not contain this path it'll try to add FileMode 0 (MISSING) to the index. One could argue that this can't happen: how can the ResolveMerger successfully (with no conflicts) merge two contents if there is no common base? This was due to another bug in ResolveMerger. It failed to find out that for two files which differ only in the FileMode (e.g. 644 vs. 755) it should not try a content merge. Change-Id: I7a00fe1a6c610679be475cab8a3f8aa4c08811a1 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>		преди 12 години
..
MergeAlgorithm.java	Optimize MergeAlgorithm if ours or theirs is empty	преди 13 години
MergeChunk.java	Fix Javadoc warnings	преди 14 години
MergeFormatter.java	Refactor diff sequence API	преди 13 години
MergeMessageFormatter.java	Adapt merge message to C Git for remote-tracking branch	преди 12 години
MergeResult.java	Refactor diff sequence API	преди 13 години
MergeStrategy.java	Extend merge support for bare repositories	преди 13 години
Merger.java	Ensure the ObjectInserter flushes after a merge	преди 12 години
ResolveMerger.java	Fix ResolveMerger not to add paths with FileMode 0	преди 12 години
StrategyOneSided.java	Extend merge support for bare repositories	преди 13 години
StrategyResolve.java	Extend merge support for bare repositories	преди 13 години
StrategySimpleTwoWayInCore.java	Simplify logic in StrategySimpleTwoWayInCore	преди 13 години
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	преди 13 години
ThreeWayMerger.java	Fix ClassCastException in MergeCommand	преди 12 години