search

aspiers / git-deps

git commit dependency analysis tool
GNU General Public License v2.0
298 stars 47 forks source link

git-deps -e or --exclude-commits still shows cherry-picked commits #53

Open vigneshraman opened 9 years ago

vigneshraman commented 9 years ago

git-deps -r -e test_branch dbde0abe, shows

dbde0abe 7a4c5de2 dbde0abe fa77dcfa fa77dcfa fd034a84 fa77dcfa 813e5727

Even though 'test' branch has the commit 'fa77dcfa' cherry-picked from master,

commit d14423fe Author: Test Date: Mon Apr 11 19:11:04 2011 -0400

Test (cherry picked from commit fa77dcfa)

git-deps will show in the list of dependent commit.

aspiers commented 9 years ago

Thanks - which repo are you trying this on?

vigneshraman commented 9 years ago

I'm using the git-deps tool for linux kernel backporting work.

I'm backporing some commits from v3.12 to v2.6

So the use case is: From 'master' I have already cherry-picked commit 'fa77dcfa' to 'v2.6_branch'

Now I want to backport commit 'dbde0abe' and I use git-deps tool to find the dependent commits. I give '-e' option to exclude commits are already present in v2.6_branch and dependent of commit 'dbde0abe'. git-deps -r -e v2.6_branch dbde0abe, shows

dbde0abe 7a4c5de2 dbde0abe fa77dcfa fa77dcfa fd034a84 fa77dcfa 813e5727

Even though 'v2.6_branch' branch has the commit 'fa77dcfa' cherry-picked from master, git-deps will show in the list of dependent commit.

I also facing another issue only with linux kernel backporting. Maybe I will raise a separate issue and explain there. Thanks.

aspiers commented 9 years ago

OK thanks, I'll take a look at this soon!

vigneshraman commented 9 years ago

Thank you.