Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
vigneshraman opened this issue Jul 20, 2015 · 4 comments
Open

Comments

@vigneshraman
Copy link

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
Copy link
Owner

aspiers commented Jul 20, 2015

Thanks - which repo are you trying this on?

@vigneshraman
Copy link
Author

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
Copy link
Owner

aspiers commented Jul 21, 2015

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

@vigneshraman
Copy link
Author

Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants