diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2011-12-09 11:17:59 +0100 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2011-12-11 01:05:13 +0100 |
| commit | 3c544647b7b3b291ad1f3661881f6d3bf9f90da4 (patch) | |
| tree | 66cea2cc9487229416e74681f8196968e241eb16 /org.eclipse.jgit.ant | |
| parent | c1f352c100278551a7a144b756983ed8a5990c41 (diff) | |
| download | jgit-3c544647b7b3b291ad1f3661881f6d3bf9f90da4.tar.gz jgit-3c544647b7b3b291ad1f3661881f6d3bf9f90da4.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.ant')
0 files changed, 0 insertions, 0 deletions