git-gerrit-bridge 1.0.1

Git subcommand to ease local branch management with gerrit.

Git Gerrit Bridge

---

Table of Contents

• Motivation
• Usage
• Installation
• License

Motivation

Working with git and gerrit can be done in numerous ways, just to name a few:

• No local branches and purely in detached HEAD mode
• One local branch per remote branch
• One local branch per bug/feature

Feature branches have the downside that there will be many and to keep the overview they have to be cleaned up/deleted regularly.

Git can do this for fully integrated branches with git branch -d <branch>. The issue with this is that often changes are purely modified in gerrit (rebase or online edits), preventing git from detecting if a local branch is fully integrated or not (git hashes differ).

The git gerrit script maps local changes to remote changes and can therefore handle such situations.
Let's look at an example usage.

Usage

• Create a new local branch feature-123, tracking the remote origin/development branch:
  git gerrit new development feature-123
• Do the implementation and commit:
  touch feature.txt
git add feature.txt
git commit -m "Added feature.txt"
• Upload changes to gerrit (Commit chains are fine):
  The remote tracking branch is automatically used as target
  git gerrit push
• Get an overview of your changes (remote and local):
  git gerrit status
  [TODO add output]
• Remove fully integrated branches:
  git gerrit clean
  [TODO add output]

Further commands are:

• git gerrit checkout <number> <branch>
  to download and checkout a gerrit change in a new local branch
• git gerrit rebase
  to start an interactive rebase of the local changes without rebasing on the remote.
• git gerrit sync
  to rebase the current branch by picking remote and local changes depending on which is newer.

Installation

pip install git-gerrit-bridge

License

git-gerrit is distributed under the terms of the GPL-3.0-or-later license.