claudiosteuernagel

Usage - This hook prevents a dev from committing code without having a reference to a tfs work item

Installation. Create a folder in your project root called githooks and save the commit-msg file in there.

The githook can then be installed by symlinking them to your .git/hooks dir.

Run these commands from the project root

$ ln -s ../../githooks/pre-commit .git/hooks/
$ ln -s ../../githooks/commit-msg .git/hooks/

claudiosteuernagel

Combining two git repositories

Use case: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:

• preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
• actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location

NB: Check out git subtree/git submodule and this Stack Overflow question before going through the steps below. This gist is just a record of how I solved this problem on my own one day.

Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.

claudiosteuernagel

Param (
    [Parameter(Mandatory=$true)]
    [string] $AssemblyInfoPath
)

$ErrorActionPreference = 'Stop'  # Stops executing on error instead of silent continue.
Set-StrictMode -Version Latest   # Enforces coding rules in expressions, scripts, and script blocks. Uninitialized variables are not permitted.

$fileContent = Get-Content $AssemblyInfoPath | Out-String
$assemblyVersionCapturePattern = 'AssemblyVersion\("\d+\.\d+\.\d+\.(\d+)"\)'

claudiosteuernagel

Param (
    [Parameter(Mandatory=$true)]
    [string] $AssemblyInfoPath,
    [string] $PropertiesFilePath = 'EnvInjectProperties.txt',
    [string] $PropertyName = 'NEXT_VERSION'
)

$ErrorActionPreference = 'Stop'  # Stops executing on error instead of silent continue.
Set-StrictMode -Version Latest   # Enforces coding rules in expressions, scripts, and script blocks. Uninitialized variables are not permitted.

claudiosteuernagel

Param (
    [Parameter(Mandatory=$true)]
    [string[]] $AssemblyInfoFilesPath,
    [Parameter(Mandatory=$true)]
    [Version] $Version
)

$ErrorActionPreference = 'Stop'  # Stops executing on error instead of silent continue.
Set-StrictMode -Version Latest   # Enforces coding rules in expressions, scripts, and script blocks. Uninitialized variables are not permitted.

claudiosteuernagel

#!/bin/bash
# Adicione um novo remote; pode chamá-lo de "upstream":

git remote add upstream https://github.com/usuario/projeto.git

# Obtenha todos os branches deste novo remote,
# como o upstream/master por exemplo:

git fetch upstream