Question about chapter "3.1 Git Branching - Branches in a Nutshell" in git docu

Axel Magard· Nov 14, 2014, 14:39 UTC · lore

Hi folks, either I still didn't grasp it or there is a mistake in chapter 3.1 "3.1 Git Branching - Branches in a Nutshell" (http://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell)

The last figure on that page shows that branch 'master' and HEAD are 
pointing to patch 87ab2, branch 'testing' to c2b9e.
 
But the output from git log --oneline --decorate --graph --all 
shows this:

* c2b9e (HEAD, master) made other changes
| * 87ab2 (testing) made a change
|/
* f30ab add feature #32 - ability to add new formats to the
* 34ac2 fixed bug #1328 - stack overflow under certain conditions
* 98ca9 initial commit of my project

Shouldn't it look like this ?

* 87ab2 (HEAD, master) made a change
| * c2b9e (testing) made other changes
|/
* f30ab add feature #32 - ability to add new formats to the
* 34ac2 fixed bug #1328 - stack overflow under certain conditions
* 98ca9 initial commit of my project

Cheers ... Axel Magard

Jeff King· Nov 14, 2014, 15:15 UTC · re: Axel Magard · lore

Re: Question about chapter "3.1 Git Branching - Branches in a Nutshell" in git docu

On Fri, Nov 14, 2014 at 03:39:29PM +0100, Axel Magard wrote:

Show 26 quoted lines

> Hi folks,
> either I still didn't grasp it or there is a mistake in chapter 3.1 "3.1 
> Git Branching - Branches in a Nutshell" 
> (http://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell)
> 
> The last figure on that page shows that branch 'master' and HEAD are 
> pointing to patch 87ab2, branch 'testing' to c2b9e.
>  
> But the output from git log --oneline --decorate --graph --all 
> shows this:
> 
> * c2b9e (HEAD, master) made other changes
> | * 87ab2 (testing) made a change
> |/
> * f30ab add feature #32 - ability to add new formats to the
> * 34ac2 fixed bug #1328 - stack overflow under certain conditions
> * 98ca9 initial commit of my project
> 
> Shouldn't it look like this ?
> 
> * 87ab2 (HEAD, master) made a change
> | * c2b9e (testing) made other changes
> |/
> * f30ab add feature #32 - ability to add new formats to the
> * 34ac2 fixed bug #1328 - stack overflow under certain conditions
> * 98ca9 initial commit of my project

I think that the git-log output is right. In the examples above, it shows "made a change" on the "testing" branch, and "made other changes" on the master branch.

But it is the figure directly above it that is wrong. Even if you look at the other figures, it is clear that 87ab2 is on the "testing" branch. But in the final diagram, the two are swapped. Looks like somebody has reported this upstream already:

  https://github.com/progit/progit2/issues/136

-Peff