index.org

Gerrit

Git Flow

Git Flow

The Problem

We are holding it wrong

Code Reviews in Pull Requests

Sure. Where do I start?

Git rebase to the rescue

! [rejected]        feature/myfeature -> feature/myfeature

 1 file changed, 5 insertions(+)
Successfully rebased and updated refs/heads/feature/myfeature.

+ 3c3ee2b...2f34b62 feature/myfeature -> feature/myfeature (forced update)

Yeah. That worked.

A Git Commit

Well, easy - isn’t it?

$ git show HEAD
commit b7c680ad8b58c6a886cd486613105ecaae7328e0
Author: Bob Ross <[email protected]>
Date:   Wed May 13 01:13:26 2015 +0200

    We do not make mistakes, we just have happy accidents.

Guess who.

» and yes, I’m somewhat biased: in my opinion, having a million monkeys throwing crap at the walls and encoding the information in the patterns on monkey shit is a better format than CVS«

Yep. This Guy.

Working with indexes and Patches

In other words, I was already working on the git “index” file. And I was planning to just have a patch-based system behind it, with a hashed history. Kind of “quilt with history and an index to speed things up”.

More than meets the eye

$ git show <b>--pretty=email</b> HEAD
From c4b10b88ab3cf3482df5bc789e8ee1afb69b7591 Mon Sep 17 00:00:00 2001
From: Bob Ross <[email protected]>
Date: Wed, 13 May 2015 01:11:13 +0200
<b>Subject: [PATCH] We do not make mistakes, we just have happy accidents.</b>

Wait. What?

$ git show <b>--pretty=fuller</b> HEAD
commit b7c680ad8b58c6a886cd486613105ecaae7328e0
Author:     Bob Ross <[email protected]>
AuthorDate: Wed May 13 01:13:26 2015 +0200
<b>Commit:     Bobs Beard <[email protected]>
CommitDate: Wed May 13 02:16:22 2015 +0000</b>

    We do not make mistakes, we just have happy accidents.