{"id":1590,"date":"2024-06-04T22:00:00","date_gmt":"2024-06-04T20:00:00","guid":{"rendered":"https:\/\/demo.sidekick.be\/itenium\/exotic-git-recipes\/"},"modified":"2025-11-28T13:31:45","modified_gmt":"2025-11-28T12:31:45","slug":"exotic-git-recipes","status":"publish","type":"post","link":"https:\/\/demo.sidekick.be\/itenium\/blog\/dev-setup\/exotic-git-recipes\/","title":{"rendered":"Exotic Git Snippets"},"content":{"rendered":"

Splitting Repositories<\/h1>\n

You start with a small project. It grows over time as you add more and more features. And then, at some point, you realize one of these features should actually have been a separate repository because it provides functionality that can be useful in multiple contexts.<\/p>\n

So far I moved the files and did a git init<\/code>. At this point, I was always sad because well, I lost the history of the feature. Not only less commits for my Github statistics but I also lost git blame<\/code> so it could no longer tell me why a particular algorithm was written the way it was.<\/p>\n

Turns out git allows you to have your cake and eat it too!<\/p>\n

# DEPRECATED!!\ngit filter-branch --prune-empty --subdirectory-filter src master\n<\/code><\/pre>\n
These days you get a deprecation warning when using filter-branch<\/code> and are pointed to a third party package instead:<\/p>\n
<\/a>newren\/git-filter-repo<\/a>: Quickly rewrite git repository history (filter-branch replacement)<\/p>\n
git-filter-repo(1) docs<\/a><\/p>\n
# Requires git >= 2.24.0 and Python >= 3.5\npip3 install git-filter-repo\ngit filter-repo -h\ngit filter-repo --path src --subdirectory-filter src\n<\/code><\/pre>\n
<\/p>\n
Locking out package-lock.json<\/h1>\n
These days each npm install<\/code> makes a git diff<\/code> on frontend projects a real drag. Page upon page of uninteresting changes.<\/p>\n
git diff -- ':!*package-lock.json' ':!*yarn.lock'\n<\/code><\/pre>\n
Or as a ~\/.gitconfig<\/code> alias:<\/p>\n
df = \"!f() { git diff --ignore-all-space -- $1 ':(exclude)*yarn.lock' ':!**package-lock.json'; }; f\"\n<\/code><\/pre>\n
Important note: If you use the git df<\/code> alias, git df package-lock.json<\/code> will never<\/strong> show anything. You\u2019ll have to use plain old git diff<\/code> for checking the excluded files!<\/p>\n
<\/p>\n
Deleting merged branches<\/h1>\n
Locally<\/strong>:
~\/.gitconfig<\/code> aliases. (develop|master)<\/code>: Do not delete these branches even if merged with current branch.<\/p>\n
merged-branches = !git branch --merged | egrep -v \"(\\*| ) (develop|master)\" | xargs -n 1\ndm = !git merged-branches git branch -d\n<\/code><\/pre>\n
Remote<\/strong>:<\/p>\n
Somehow a CI server always seems to be amassing feature branches. A simple cleanup script to the rescue!<\/p>\n
Replace name-committer<\/code> (author filter) and origin<\/code> (remote filter) and add as a ~\/.gitconfig<\/code> alias:<\/p>\n
my-merged-remote-branches = !git for-each-ref --format='%(authorname):%(refname)' | egrep \"name-committer\" | egrep \"refs\/remotes\" | sed -e \"s\/^.*:refs\\\/remotes\\\/origin\\\/\/:\/\"\n<\/code><\/pre>\n
Followed by PowerShell:<\/p>\n
git my-merged-remote-branches | % { git push --no-verify origin $_ }\n<\/code><\/pre>\n
<\/p>\n
Filename case renaming<\/h1>\n
Pesky Windows.
 Also note the core.ignorecase<\/code><\/a> configuration value.<\/p>\n
git mv -f OldFileNameCase newfilenamecase\n<\/code><\/pre>\n
<\/p>\n
Remapping remote urls<\/h1>\n
When the remote url changes for all your repositories.<\/p>\n
$paths = Get-ChildItem \"c:git-repos\" | ? { $_.PSIsContainer }\nforeach ($path in $paths) {\n    $gitPath = Join-Path $path.FullName \".git\"\n    if (Test-Path -Path $gitPath -PathType Container) {\n        Write-Host $path.FullName \" -> \" $gitPath\n        $url = \"https:\/\/new-base-url.com\/$($path.Name)\"\n        Write-Host \"Remap to $url\"\n        Push-Location $path.FullName\n        git remote set-url origin $url\n        Write-Host \" \"\n        Pop-Location\n    }\n}\n<\/code><\/pre>\n
<\/p>\n
Create PR in browser<\/h1>\n
From your current branch.<\/p>\n
function Create-PullRequest() {\n  $baseUrl = git remote get-url origin\n\n  if ($baseUrl -match 'github.com') {\n    $urlTemplate += \"{base-url}\/compare\/{target-branch}...{source-branch}\"\n  } else {\n    $urlTemplate += \"{base-url}\/pullrequestcreate?sourceRef={source-branch}&targetRef={target-branch}\"\n  }\n\n  $sourceBranch = git rev-parse --abbrev-ref HEAD\n  # $targetBranch = \"develop\"\n  $targetBranch = \"master\"\n\n  git push -u origin $sourceBranch\n  start $urlTemplate.Replace(\"{base-url}\", $baseUrl).Replace(\"{source-branch}\", [uri]::EscapeDataString($sourceBranch)).Replace(\"{target-branch}\", $targetBranch)\n}\n\nSet-Alias pr Create-PullRequest\n<\/code><\/pre>\n<\/p>\n
Other blog posts<\/h1>\n