Linux

Using GitLab CI to deploy to remote host over ssh

I've been using GitLab for a while now and I really like it. I can't objectively say whether it's better than GitHub or not (I have a few projects on GitHub but I rarely make any changes to them and even more rarely use the web UI), but one of the things I appreciate about GitLab is the fact that I can run my own copy of it and store my own stuff in ...

Read More

Linux

Custom Email Notifications in GitLab

I started playing around with GitLab last month in order to get to know it a better and, while I like it well enough, the one thing that drove me nuts was the email that it sent out alerting of changes. My old git setup used the wonderful git-notifier script to send out emails and I much prefer the format it used than the format GitLab uses. Unfortunately, at that time, without ...

Read More

Linux

Git patch workflow

Probably most people who use git know about patch management and whatnot, so I'm writing this largely for myself as I keep forgetting (mostly because I don't have to do it very often).

Some code that I'm working on has a development branch which I'm working on while other fixes are being made to the master branch. This is great, except for the fact that I need to apply any changes made to master to ...

Read More

Linux

Git commit hook to bugzilla using git-notifier

I'm a big fan of the git-notifier script, which acts as a hook in git to send you nice emails about things that have changed in your git repos. I'm also a bugzilla user, so I wanted to be able to put git commit notifications, automatically, in bugzilla if "bug #X" is in the commit log. Initially I was intending to use gitzilla for this, but I didn't feel like attempting ...

Read More

Linux

Some quick git tips

As I've been git-ifying some stuff around here, I've run into a few tips that might be useful for other git beginners.

The first is to setup some global options, some of which are nice for folks coming from Subversion. Having a global ignore file is useful. Mine has the following contents:

*~ *.orig *.rej *.swp .#* *.o .DS_Store

Then adjust some global git options:

$ git config --global core.excludesfile ~/.gitignore $ git config --global alias.st status $ git config --global alias.ci commit $ git config ...

Read More

Linux

Dissecting part of a subversion repo to git

Well, that was pretty easy to figure out. As per my last post, I was going to try to break out the AIDE+gpg part of the Annvix tools subversion repo to be it's own git repo. It was scary simple.

First, the location of AIDE+gpg in the subversion repo was "tools/AIDE+gpg" and it had one sub-directory, "trunk". I never did end up using tags or branches or anything there. So the entire ...

Read More

Linux

Figuring this git thing out

I'm a little old-school in that I like subversion. I've used subversion for years, and have had it as a big part of my workflow for a really really long time. Unfortunately, there's this git thing popping up all over the place and I'm starting to feel dated. (It's bad enough that my daughter turned 10 this month, which makes me feel old, so I have to find other ways of not ...

Read More

macOS

Choosing the right Git GUI client for Mac OS X

Last week's mac techmail was Choosing the right Git GUI client for Mac OS X in which I looked at the Tower application, a Git GUI client for OS X. I've looked at a few Git clients for OS X and Tower was my application of choice amongst the contenders; the tip explains why. Tower isn't as feature-complete as I would like it to be (most notably it's missing git-svn support), but ...

Read More

Linux

New Fedora git repositories

A little bit frustrated with Fedora's new git repositories this morning (for packages). Ding-Yi Chen has a really nice write-up on how to get started with it. Got me a few of the essentials that I had missed earlier. I like the new certificate that can be used with Koji. That's pretty slick. Ding-Yi Chen also points to a few of the official git-related pages you may ...

Read More