undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log --cherry: a synonym

Browse Source 
At the porcelain level, because by definition there are many more contributors
than integrators, it makes sense to give a handy short-hand for --right-only
used with --cherry-mark and --no-merges.  Make it so.

In other words, this provides "git cherry with rev-list interface".

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber 2011-03-07 13:31:42 +01:00 committed by Junio C Hamano
parent cb56e3093a
commit 94f605ec07
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/rev-list-options.txt
View File

@ -337,6 +337,14 @@ commits from `B` which are in `A` or are patch-equivalent to a commit in
More precisely, `--cherry-pick --right-only --no-merges` gives the exact More precisely, `--cherry-pick --right-only --no-merges` gives the exact
list. list.
--cherry::
A synonym for `--right-only --cherry-mark --no-merges`; useful to
limit the output to the commits on our side and mark those that
have been applied to the other side of a forked history with
`git log --cherry upstream...mybranch`, similar to
`git cherry upstream mybranch`.
-g:: -g::
--walk-reflogs:: --walk-reflogs::

10
revision.c
View File

@ -1289,12 +1289,20 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->left_right = 1; revs->left_right = 1;
} else if (!strcmp(arg, "--left-only")) { } else if (!strcmp(arg, "--left-only")) {
if (revs->right_only) if (revs->right_only)
die("--left-only is incompatible with --right-only"); die("--left-only is incompatible with --right-only"
" or --cherry");
revs->left_only = 1; revs->left_only = 1;
} else if (!strcmp(arg, "--right-only")) { } else if (!strcmp(arg, "--right-only")) {
if (revs->left_only) if (revs->left_only)
die("--right-only is incompatible with --left-only"); die("--right-only is incompatible with --left-only");
revs->right_only = 1; revs->right_only = 1;
} else if (!strcmp(arg, "--cherry")) {
if (revs->left_only)
die("--cherry is incompatible with --left-only");
revs->cherry_mark = 1;
revs->right_only = 1;
revs->no_merges = 1;
revs->limited = 1;
} else if (!strcmp(arg, "--count")) { } else if (!strcmp(arg, "--count")) {
revs->count = 1; revs->count = 1;
} else if (!strcmp(arg, "--cherry-mark")) { } else if (!strcmp(arg, "--cherry-mark")) {