git cherry-menu: allow blacklist edit if patch-id changed after cherry-pick#4
git cherry-menu: allow blacklist edit if patch-id changed after cherry-pick#4ningjiang wants to merge 3 commits intoaspiers:masterfrom
Conversation
…y-pick Normally we would only blacklist the upstream branch we're working on if patch-id changed after a successful cherry-pick. Thus we can still port the patch to other branch in the future.
"git show --notes" will return 141 when file contents are very long and you enter 'q' command. safe_run will fail because of it and will give the following error: git show --notes $sha1 failed! Aborting. Hence we couldn't use safe_run for this command.
bin/git-cherry-menu
Outdated
There was a problem hiding this comment.
Yeah, finding the upstream branch name is the difficult bit :-( I don't know how to do it without an interface redesign.
There was a problem hiding this comment.
An interface redesign is much better. We can use git cherry-menu like this:
git icing -v3 upstreaming_branch master_branch | git cherry-menu upstreaming_branch
or redirect the stdin from file:
git icing -v3 upstreaming_branch master_branch >porting_list; git cherry-menu upstreaming_branch <porting_list
The latter case also gives us the ability to modify the list for automatically blacklisting all the commits in it. For example, we can add --auto-blacklist option. Then git cherry-menu can blacklist all the commits in porting_list automatically.
There was a problem hiding this comment.
Piping the cherry-pick "TODO list" into git cherry-menu is what I originally wanted to do, but it's not possible like that, because git cherry-menu requires STDIN to be the tty so that it can work interactively. If you can figure out a way to make it work then I'd welcome the pull request!
2 participants
Normally we would only blacklist the upstream branch we're working on if
patch-id changed after a successful cherry-pick. Thus we can still port
the patch to other branch in the future.
This is an initial attempt. Please help to review and give feedback.