Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions bin/git-cherry-menu
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ suggested options:
issue tracker without getting in the way during repeated
runs of cherry-menu.

-c cherry-menu.skip-branch=<branch>
The blacklist default setting is to blacklist a commit for 'all'
upstream branches. If one wants to blacklist a commit for a specific
branch by default when doing a run of cherry-menu, then specify it here.

COMMAND is typically "git icing -v2" or "git cherry" but can be
anything which gives output in the same format, e.g.

Expand Down Expand Up @@ -253,12 +258,16 @@ cherry_menu () {
;;
b)
if ! has_note "$sha1"; then
safe_run git notes append -m'skip: all
XXX (you can optionally change the "all" above to the name of the
XXX upstream branch if you want to limit blacklisting to that upstream)

XXX Enter your justification for blacklisting here or
XXX remove the whole note to cancel blacklisting.' "$sha1"
branch="$(git config cherry-menu.skip-branch)"
if test -z $branch; then
branch="all"
fi
safe_run git notes append -m "skip: `echo $branch`
### (you can optionally change the "all" above to the name of the
### upstream branch if you want to limit blacklisting to that upstream)

### Enter your justification for blacklisting here or
### remove the whole note to cancel blacklisting." "$sha1"
fi
safe_run git notes edit "$sha1" <&3
echo
Expand Down