How to handle false-positive with git-cherry ?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

I have several "maintainance" branches which are based on
different version of my software, which contains only fixes,
imported with 'git cherry-pick'.

I use to comparing stable branches to see if one of them is not
missing a fix for instance. For that purpose I use "git cherry"
of "git log --cherry".

But sometimes git reports me some false-positives because one fix
in a particular branch has been slighlty modified when cherry-picking
it (because the context has slighly changed between 2 versions of
my soft).

Basically I'd like to force git-cherry to assume that the
patch-id of a commit is the same as the one it's been cherry
picked from even if the diff is not exactly the same.

One way to do this would be for    git-cherry to use the string
added by "git-cherry-pick -x":

     (cherry picked from commit xxx)

and to handle the indirection in order to calculate the patch-id.

I couldn't find something equivalent of this with git, but maybe
I've missed an option... could anybody tell me if something
similar already exist ?

Thanks.
-- 
Francis
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]