{"thread":{"id":"10545","subject":"Bug in git-show-branch, or in core-tutorial?","startedAt":"2007-10-31T20:17:39Z","lastAt":"2007-11-01T12:11:42Z","messageCount":3,"participants":["Sergei Organov","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"57726","messageId":"878x5j3uos.fsf@osv.gnss.ru","threadId":"10545","inReplyTo":null,"subject":"Bug in git-show-branch, or in core-tutorial?","fromName":"Sergei Organov","fromEmail":"osv@javad.com","sentAt":"2007-10-31T20:17:39Z","receivedAt":"2007-10-31T20:17:39Z","isPatch":false,"sender":{"key":"osv@javad.com","avatar":null},"body":"Or is it me who needs a fix?\n\n[Sorry, this is roughly a repeat of my earlier post\n\nI didn't get any answer to, and I'm trying once more to attract\nyour attention to the issue.]\n\nPlease consider the following quote starting at core-tutorial.txt:933\n(emphasis is mine):\n\n\n------------------------------------------------\n$ git show-branch --topo-order master mybranch\n* [master] Merge work in mybranch\n ! [mybranch] Some work.\n--\n- [master] Merge work in mybranch\n*+ [mybranch] Some work.\n------------------------------------------------\n\nThe first two lines indicate that it is showing the two branches\nand the first line of the commit log message from their\ntop-of-the-tree commits, you are currently on `master` branch\n(notice the asterisk `\\*` character), and the first column for\nthe later output lines is used to show commits contained in the\n`master` branch, and the second column for the `mybranch`\nbranch. *Three* commits are shown along with their log messages.\nAll of them have non blank characters in the first column (`*`\nshows an ordinary commit on the current branch, `-` is a merge commit), which\nmeans they are now part of the `master` branch. Only the \"Some\nwork\" commit has the plus `+` character in the second column,\nbecause `mybranch` has not been merged to incorporate these\ncommits from the master branch. The string inside brackets\nbefore the commit log message is a short name you can use to\nname the commit. In the above example, 'master' and 'mybranch'\nare branch heads. '*master~1*' is the first parent of 'master'\nbranch head.\n\n\nYou see, there are only *two* commits shown by git-show-branch while\ndescription mentions *three* of them, and there is no 'master~1' commit\nin the git-show-branch output while description does mention it.\n\nI've replayed all the tutorial up to this point, and the git-show-branch\noutput matches those in the tutorial exactly, but then the explanation\ntext makes little sense? On the other hand, the state of the repo\nsuggests that there should be 'master~1' commit in the git-show-branch\noutput in accordance with the explanation, so it's git-show-branch that\nis buggy? I'm totally confused :(\n\nPlease, help!\n\n-- \nSergei.\n"},{"id":"57789","messageId":"7v8x5ictrx.fsf@gitster.siamese.dyndns.org","threadId":"10545","inReplyTo":"878x5j3uos.fsf@osv.gnss.ru","subject":"Re: Bug in git-show-branch, or in core-tutorial?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-01T07:24:50Z","receivedAt":"2007-11-01T07:24:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I think that is a simple typo of \"these\", not \"three\".\n"},{"id":"57810","messageId":"87zlxy2mip.fsf@osv.gnss.ru","threadId":"10545","inReplyTo":"7v8x5ictrx.fsf@gitster.siamese.dyndns.org","subject":"Re: Bug in git-show-branch, or in core-tutorial?","fromName":"Sergei Organov","fromEmail":"osv@javad.com","sentAt":"2007-11-01T12:11:42Z","receivedAt":"2007-11-01T12:11:42Z","isPatch":false,"sender":{"key":"osv@javad.com","avatar":null},"body":"Junio C Hamano writes:\n\n> I think that is a simple typo of \"these\", not \"three\".\n\nNo, the explanation text explicitly mentions merge~1 revision that is\nnot there in the git-show-branch output, so those \"three\" is consistent\nwith explanation text itself, but not with git-show-branch output.\n\n-- \nSergei.\n"}]}