{"thread":{"id":"40597","subject":"How to handle false-positive with git-cherry ?","startedAt":"2015-10-20T16:25:02Z","lastAt":"2015-10-20T16:25:02Z","messageCount":1,"participants":["Francis Moreau"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"271977","messageId":"CAC9WiBjGVAq-i+-ELG4rH-axU3e0GfMDOBZgZiy9iYU37BQ=cw@mail.gmail.com","threadId":"40597","inReplyTo":null,"subject":"How to handle false-positive with git-cherry ?","fromName":"Francis Moreau","fromEmail":"francis.moro@gmail.com","sentAt":"2015-10-20T16:25:02Z","receivedAt":"2015-10-20T16:25:02Z","isPatch":false,"sender":{"key":"francis.moro@gmail.com","avatar":null},"body":"Hi,\n\nI have several \"maintainance\" branches which are based on\ndifferent version of my software, which contains only fixes,\nimported with 'git cherry-pick'.\n\nI use to comparing stable branches to see if one of them is not\nmissing a fix for instance. For that purpose I use \"git cherry\"\nof \"git log --cherry\".\n\nBut sometimes git reports me some false-positives because one fix\nin a particular branch has been slighlty modified when cherry-picking\nit (because the context has slighly changed between 2 versions of\nmy soft).\n\nBasically I'd like to force git-cherry to assume that the\npatch-id of a commit is the same as the one it's been cherry\npicked from even if the diff is not exactly the same.\n\nOne way to do this would be for    git-cherry to use the string\nadded by \"git-cherry-pick -x\":\n\n     (cherry picked from commit xxx)\n\nand to handle the indirection in order to calculate the patch-id.\n\nI couldn't find something equivalent of this with git, but maybe\nI've missed an option... could anybody tell me if something\nsimilar already exist ?\n\nThanks.\n-- \nFrancis\n"}]}