batie.comBrett Batie — Thoughts of a Software Engineer.

B RETT B ATIE ( Thoughts of a Software Engineer: Today, Yesterday & Tomorrow ) About Me I am a Software Engineer with around 20 years of experience. Programming is not only a skill but my passion. I am currently building Filerev for Google Drive to help remove the clutter from users Google Drive accounts. Navigation Home Filerev App Blog Categories Scripting (12) Software Development (28) AWS (1) Technology (1) Uncategorized (1) Website Development (5) Subscribe to Blog via Email Enter your email address to subscribe to this blog and receive notifications of new posts by email. Email Address Subscribe Advertisements You are here: Home Git Flow – Remove Local & Remote Feature Branches by Brett on June 16, 2016 I love using the Git branching model outlined by Vincent Driessen . My flow is almost identical to what he has described except for where the feature branches are stored. Specifically he states: Feature branches typically exist in developer repos only, not in origin. I’m a little less trusting with feature branches and instead often push them to the central remote repository. For me, I fear that days of work could be lost by keeping the work solely on my repo until it is ready to be merged back into the develop branch. I can imagine my repository being corrupted, my hard drive dying or my computer being stolen all causing work loss. I don’t like to leave my hard work to Murphy’s law . Now one could use a backup strategy to mitigate this issue and I do highly recommend doing this. I have used CrashPlan for years and it has saved me a few times, making CrashPlan worth every penny. However, I also like to know there is a central Git repository holding my code (again a trust issue). Plus some companies will not allow their code to be placed on any server outside of their network. Since myself and my entire team have chosen to place our feature-*” branches on our central remote repository, it has caused a small issue. We find that we end up with a lot of old and forgotten branches on this remote repository as well as our local machines. Of course Git is great at this task of removing the old branches. Delete Local & Remote Branches We can remove the remote branch by using the command: git push origin delete branchName Then we can remove the local branch with the command: git branch -d branchName Great, problem solved I can run those two commands each time I’m done working on a feature. But wait, I don’t want to remember those two commands and I want to run only one command. So, I put together a couple bash functions that will make this easier. Just drop these functions in your ~/.bashrc file or in the appropriate dotfiles directory if you happen to be using my Dot File Manager . function confirm () { # call with a prompt string or use a default read -r -p "${1:-Are you sure? [y/N]} " response case $response in [yY][eE][sS]|[yY]) true ;; *) false ;; esac } function git-delete-branch () { if [ "$#" -ne 1 ]; then printf "Usage: $FUNCNAME branchName\nWill delete the specified branch from both the local repository and remote\n"; return 1; fi echo "Delete the branch ’$1’ from your local repository?" && confirm && git branch -d $1; echo "Delete the branch ’$1’ from the remote repository?" && confirm && git push origin delete $1; } After adding these functions don’t forget to use the source command to load the functions into your shell. Now a branch can be easily deleted from both the local and remote repository or just one of them by executing the command: git-delete-branch branchName Delete Merged Branches Since we have multiple developers all pushing their branches to the central repository, we often find that over time we start to get a long list of orphaned branches (branches that no one is working on anymore). Any easy way to clean up most of these branches is with the following command which will show the branches that have already been merged into your current branch. git branch merged Then each branch can be manually deleted with the command: git push origin delete branchName Again, I like things simple so I put together the following function to streamline the process: function git-delete-merged-branches () { echo && \ echo "Branches that are already merged into $(git rev-parse abbrev-ref HEAD) and will be deleted from both local and remote:" && \ echo && \ git branch merged | grep feature && \ echo && \ confirm && git branch merged | grep feature | xargs -n1 -I ’{}’ sh -c "git push origin delete ’{}’; git branch -d ’{}’;" } Make sure you use the the confirm function pasted above. Another tool Another possible solution to the above stated problem is to use the git-flow tool. At first glance it seems to be a handy tool to automate many of the tasks in the GitFlow process. However, in my short experience with it, I found it doing things I didn’t expect. I then checked the github repository and noticed an unhealthy amount of open issues (175) and pull requests (78) with the last commit date being September of 2012. This project is officially dead in my book. More recently, I have found out that there is another fork of this project that is being kept up-to-date. It’s called git-flow (AVH Edition) . This one might have more potential. However, I think the GitFlow approach is easy enough to carry out with the standard Git tool that I have not yet taken the time to test out this newer git-flow (AVH Edition) tool. Have you used the newer git-flow tool? What are your experiences with it? Do you have any other git commands or tools that have helped with your day-to-day Git operations? { Be the first to comment } Install a Free SSL Certificate (LetsEncrypt) on CentOS with Apache and WordPress by Brett on June 4, 2016 I’ve had my blog running on port 80 for years and have finally decided it is time to deprecate HTTP and move everything to a secure SSL connection. This decision was a lot easier to make now that Let’s Encrypt is providing free SSL certificates and has been out of beta since April . I also appreciate that the entire installation can be done via command line and that the certificate can be automatically renewed a month before it expires. Wahoo, no more pesky calendar reminders to tell me to hurry up and buy a new certificate before it expires and manually install it. With that said, my blog is currently running on CentOS 6 with Apache with vhost files placed in a non-standard directory by DirectAdmin . This means I will have to manually add the certificate information to the vhost file for each host instead of letting Let’s Encrypt do all the work for me. That’s ok though, as I will only have to do this once. Also, CentOS 6 will throw a little curve ball as it doesn’t have Python 2.7 setup by default and depends on Python 2.6 for yum . So, care will be taken to get them both setup on the machine. Here are the steps needed to set up Let’s Encrypt. First, we need to set up the IUS repository with the following commands: wget https://centos6.iuscommunity.org/ius-release.rpm sudo rpm -Uvh ius-release*.rpm rm ius-release.rpm Then, we need to get Python setup: sudo yum update sudo yum install centos-release-scl python27 python27-devel python27-pip python27-setuptools python27-virtualenv Next, we will install pip as that gives us any easy way to install Let’s Encrypt and update it in the future. sudo easy_install-2.7 pip Now we will install Let’s Encrypt (which also goes by the name certbot) sudo pip2.7 install letsencrypt letsencrypt-apache If you happen to have a very vanilla Apache setup and are running Debian then the following command to generate and install the certificate may magically setup everything for you. This was not the case for me so I didn’t use this step. sudo certbot apache -d brett.batie.com Or, you could try to be more specific about where your config files are located for Apache as I did in the following command. However, at the time of this writing this does not work if your vhost file has more than one vhost in it . So, I...