found 573917 git-core/1:1.7.0.3-1
tags 573917 + upstream
clone 573917 -1
retitle -1 git-cherry.1 needs a BUGS section
retitle 573917 git-cherry --full to take all upstream commits into account
severity 573917 wishlist
thanks
Hi,
Frédéric Brière wrote:
> Taking the example given in git-cherry(1), if one were to merge
> <upstream> into <head> (as is often done), then git-cherry would now
> report that all commits between fork-point and <head> are no longer
> found in <upstream>.
Nice report. Like many bugs, this has two parts. The most interesting
part is the documentation bug.
git-cherry.1 doesn’t really warn about this situation. How about
something like this:
BUGS
If one merges <upstream> into <head> (as is often done), then
git-cherry will report all commits between the old fork-point
and <head> as no longer found in <upstream>.
____*____*____*_____*__> new fork-point = <upstream>
/ \
old fork-point \
\__+__+__-__+__+__-__+__*_> <head>
While these commits are still part of upstream..head, their
upstream counterparts are no longer
in head..upstream.
It would probably also be useful to add an option to make git cherry
take into account the patch-ids of all commits from the upstream branch,
as slow as that would be.
Thoughts?
Jonathan
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
