Bug in git-show-branch, or in core-tutorial?

Previous thread: [PATCH] Don't use cpio in git-clone when not installed by Mike Hommey on Wednesday, October 31, 2007 - 4:05 pm. (14 messages)

Next thread: [PATCH] cvsexportcommit: fix for commits that do not have parents by Brad King on Wednesday, October 31, 2007 - 4:16 pm. (1 message)
To: <git@...>
Date: Wednesday, October 31, 2007 - 4:17 pm

Or is it me who needs a fix?

[Sorry, this is roughly a repeat of my earlier post
<http://permalink.gmane.org/gmane.comp.version-control.git/62493>
I didn't get any answer to, and I'm trying once more to attract
your attention to the issue.]

Please consider the following quote starting at core-tutorial.txt:933
(emphasis is mine):

<quote>
------------------------------------------------
$ git show-branch --topo-order master mybranch
* [master] Merge work in mybranch
! [mybranch] Some work.
--
- [master] Merge work in mybranch
*+ [mybranch] Some work.
------------------------------------------------

The first two lines indicate that it is showing the two branches
and the first line of the commit log message from their
top-of-the-tree commits, you are currently on `master` branch
(notice the asterisk `\*` character), and the first column for
the later output lines is used to show commits contained in the
`master` branch, and the second column for the `mybranch`
branch. *Three* commits are shown along with their log messages.
All of them have non blank characters in the first column (`*`
shows an ordinary commit on the current branch, `-` is a merge commit), which
means they are now part of the `master` branch. Only the "Some
work" commit has the plus `+` character in the second column,
because `mybranch` has not been merged to incorporate these
commits from the master branch. The string inside brackets
before the commit log message is a short name you can use to
name the commit. In the above example, 'master' and 'mybranch'
are branch heads. '*master~1*' is the first parent of 'master'
branch head.
</quote>

You see, there are only *two* commits shown by git-show-branch while
description mentions *three* of them, and there is no 'master~1' commit
in the git-show-branch output while description does mention it.

I've replayed all the tutorial up to this point, and the git-show-branch
output matches those in the tutorial exactly, but then the explan...

To: Sergei Organov <osv@...>
Cc: <git@...>
Date: Thursday, November 1, 2007 - 3:24 am

I think that is a simple typo of "these", not "three".

-

To: Junio C Hamano <gitster@...>
Cc: <git@...>
Date: Thursday, November 1, 2007 - 8:11 am

No, the explanation text explicitly mentions merge~1 revision that is
not there in the git-show-branch output, so those "three" is consistent
with explanation text itself, but not with git-show-branch output.

--
Sergei.
-

Previous thread: [PATCH] Don't use cpio in git-clone when not installed by Mike Hommey on Wednesday, October 31, 2007 - 4:05 pm. (14 messages)

Next thread: [PATCH] cvsexportcommit: fix for commits that do not have parents by Brad King on Wednesday, October 31, 2007 - 4:16 pm. (1 message)