Re: 500 Internal Server Error with 2-way diff and commit that renames file to its parent directory

2023-11-19 Thread Branko Majic
Hello and sorry for the late reply :) I am still interested in getting a nice fix for these couple of issues, although it might take me a bit of time (got a couple of side-projects currently related to my current desktop slowly kicking the bucket...). I'll try to address the issues one at a time

Re: 500 Internal Server Error with 2-way diff and commit that renames file to its parent directory

2023-11-12 Thread Mads Kiilerich
Thanks. Without digging deep at all, a quick answer: Evidently, that is a corner case that doesn't have any/sufficient test coverage. But it might not be worth it to add it. First of all, it is a bug that this NodeError shows up as a server error. It should show a nice error, as it

Re: 500 Internal Server Error with 2-way diff and commit that renames file to its parent directory

2023-11-11 Thread Branko Majic
Ok, I've managed to hack up a quick fix for this, but... It does look a bit ugly. Feels like there's too much repetitive code in there as well. The patch is attached to the mail. Looking at what the server does when you pass in a path that is directory in both changesets, it really should not

500 Internal Server Error with 2-way diff and commit that renames file to its parent directory

2023-11-11 Thread Branko Majic
Hello, I have managed to run into a peculiar corner case that reliably triggers internal server error when performing a 2-way diff on a file that got moved out of sub-directory and renamed to have the same name as the sub-directory that used to contain it. The issue is reproducible with both Git