Git on Rietta Cybersecurity

Acknowledge Open-Source Contributors with Git Authorship

Mon, 07 Oct 2019 10:00:00 -0600

Even though Git has been around since 2005 and has definitely taken over as the primary VCS, some developers do not utilize git to the fullest of its ability. Some developers even intentionally execute commands to remove functionality, such as replacing commit authors with their own. Additionally, it’s shocking that some of these mishaps occur in popular repositories, such as vim, but often maintainers express no intention of changing. In modern times, Github has fortunately made the process of keeping git authors intact trivial.

Why do Rietta Developers Git Fork?

Wed, 25 Sep 2019 13:00:00 -0400

Why Fork a repository? Forking a open source project is the standard way for collaborators such as ourselves to fix bugs, experiment, and add features to existing open source projects without affecting the main repository. We can use the Fork feature on Github to create a repo on Github in which is a clone of the original repo we forked. Github has a great article https://help.github.com/en/articles/fork-a-repo that explains how we can fork off from a repository on Github.

What's the Difference Between the 3 Github Merge Methods?

Fri, 07 Jun 2019 13:00:00 -0400

Keeping a clean git history can save a lot of time when trying to track down commits related to a bug or issue that is disrupting dev efforts. GitHub provides three options when merging in commits, these three options being: Create a Merge Commit Squash and Merge Rebase and Merge Merging with a merge commit, squash merging, and “Rebase & Merge” should be pretty familiar as these are commands that are already commonly used when working on dev branches to keep commits on PRs tidy.

Manually Editing Git Hunks: The Easy Way

Thu, 23 May 2019 12:10:00 -0400

If you’ve been following our Git related posts, you probably notice we use git add --p with many of the examples used. This a great way for developers to split up code changes on one file to their own commit message. Not only will this make your pull requests cleaner, but will allow the code reviewer to get valuable context when diving into code changes on said file. Git add patch gives us many options: Stage this hunk [y,n,q,a,d,e,?

How to hide .gitignored Files from fzf.vim

Tue, 21 May 2019 10:30:00 -0400

Fuzzy finders find files that almost no developer would intentionally find via a fuzzy finder from paths such as node_modules/, deps/, and dist/. These tend to get in the way of the true power of fuzzy file searching and ignoring these individually can be a pain. There are also files like .circleci/config.yml, .gitignore, and .rubocop.yml that are opened often enough to be included in the result set.

Luckily when working in a git repository, developers typically only care about the files they commit. When using fzf.vim, this technique returns files based on the git tree leaving out irrelevant files, including the hidden files that were shown before.

Restrict Who Can Push to Matching Branches on Github

Thu, 09 May 2019 11:00:00 -0500

An anonymous attacker has been compromising Git repositories and demanding ransom. This attacker stole the contents and used a force push to wipe the remote repository causing many to lose access to their critical source code assets. Use critical security tools available within the Git ecosystem to protect your company from this threat with:

Deploy Keys
Mandatory Two Factor Authentication
Protected Branches and Pull Requests
Backups of your Git Repositories

Fixup your Code Reviews with git rebase --autosquash

Tue, 07 May 2019 11:00:00 -0400

Here at Rietta, we like to do in-depth code reviews that are sometimes accompanied with feedback that may require changes to be made to the pull request. When making additional commits with changes based on the feedback, we can get into a messy workflow that can lead to complex branch wrangling. In this article, I will go over a few Git commands to help ease our post code-review revisions: git commit --fixup commit-SHA git rebase -i --autosquash source-branch Our team utilizes Github’s Squash and merge when merging into master, with semantic git commits that are specific to their respective code changes.

How to Use git reset

Mon, 22 Apr 2019 16:00:00 -0400

The command git reset is a powerful tool that Rietta staff use on a daily basis. However powerful, git reset has 2 distinct features: Hard resets, in which will modify the working tree Soft resets, in which will modify the index Often you’ll hear that the reset command is basically the opposite of the add command. While this is true for the default reset, there are other options to reset the index without unstaging the files as well.