{"thread":{"id":"53140","subject":"[BUG] log --follow ignore files renamed in a merge commit","startedAt":"2020-03-31T05:28:52Z","lastAt":"2020-03-31T05:28:52Z","messageCount":1,"participants":["Thibault Delor"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"394403","messageId":"CAM+dguao5CtTUp1Fxc+BXnhYzTqU_0oWrsaK0RiwUcM10iq3hg@mail.gmail.com","threadId":"53140","inReplyTo":null,"subject":"[BUG] log --follow ignore files renamed in a merge commit","fromName":"Thibault Delor","fromEmail":"delor.thibault@gmail.com","sentAt":"2020-03-31T05:28:34Z","receivedAt":"2020-03-31T05:28:52Z","isPatch":false,"sender":{"key":"delor.thibault@gmail.com","avatar":null},"body":"Hello there,\n\nI have raised my initial issue on Stack Overflow:\nhttps://stackoverflow.com/questions/60927159/merging-repo-with-git-subtree-prefix-break-the-history\n\nAfter reading the code, it's definitely a bug with git log.\nThe actual issue is that if a file has been renamed inside a commit\nwith 2+ parents `git log --follow` won't show it and loose track of\nthe file. On the other side, running `git log -m --follow ...` is\nworking as expected.\n\nI would be really keen to submit a patch in the next couple of days.\n\nI am planning to tweak the method `log_tree_diff` in log_tree.c as I\nfeel that's where the error coming from. I am guess I will have to\nforce somehow the evaluation of the diff (even if the diff isn't\ndisplayed) so the method `try_to_follow_renames` gets a chance to be\nevaluated.\n\nI have never contributed to git source code, I'll the doc\n\"SubmittingPatches\" but feel free to give any guidance.\n\nThanks\nTibo\n"}]}