Magnus Holmgren

I have encountered the same issue with git 2.39 (Debian 12 "bookworm"). git 2.30 works. Obviously the bug isn't in `Annotate::doAnnotate()`; rather, it gets bad data in. Something is wrong...

OK, that wasn't the full command. Something has changed with respect to the `-m` flag. Previously, it made diffs be included for merge commits. Now it seems to make every...

Yeah, `git --diff-merges=separate` doesn't seem to be working properly. Not only does it include irrelevant merge commits; it doesn't even generate the full diff with respect to each parent it's...

The commit that introduces the changed behaviour is https://github.com/git/git/commit/0dec322d31db3920872f43bdd2a7ddd282a5be67. I'm not sure that I understand or agree with the explanation in the commit message, but it can be counteracted with...

Upon further testing it appears that while `--simplify-merges` often makes stuff work, the result is not the same as when running Git 2.35 without it. I think that any time...

I think the whole problem is that in `Git::addChunk()`, `mergeSha` is constructed by taking the next free number instead of the correct index from the list of parents, but the...

This means that as long as long as all merge commits affecting a specific file merge some change into the main branch (i.e. there is a difference relative to the...