3 files changed, 93 insertions, 0 deletions
diff --git a/modules/home/pkgs/default.nix b/modules/home/pkgs/default.nix
index e7b269ac..cfbe30a8 100644
--- a/modules/home/pkgs/default.nix
+++ b/modules/home/pkgs/default.nix
@@ -196,6 +196,7 @@ with pkgs; let
         git-absorb # git commit --fixup, but automatic
         git-edit-index # Allows you to edit the indexed version of a file
         git-cm # A wrapper that re-adds the last commit's subject
+        git-cleanup # An automatic merged branch deleter
         glow # Command-line markdown renderer
       ];
     };
diff --git a/pkgs/by-name/gi/git-cleanup/git-cleanup.sh b/pkgs/by-name/gi/git-cleanup/git-cleanup.sh
new file mode 100755
index 00000000..1ab7bbd1
--- /dev/null
+++ b/pkgs/by-name/gi/git-cleanup/git-cleanup.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env dash
+
+# shellcheck source=/dev/null
+SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH
+
+help() {
+    cat << EOF
+Automatically remove merged branches (remote and local)
+
+USAGE:
+    git-cleanup [OPTIONS]
+
+OPTIONS:
+    --remote    | -r
+                            Act on remote branches
+
+    --help      | -h
+                            Display this help and exit.
+
+    --version   | -v
+                            Display version and copyright information and exit.
+EOF
+}
+
+# This should always be the correct answer.
+get_default_branch() {
+    # source: https://stackoverflow.com/a/50056710
+    # We assume, that 'origin' is the remote in use
+    git remote show origin | sed -n '/HEAD branch/s|.*: ||p'
+}
+
+cleanup() {
+    default_branch="$(get_default_branch)";
+
+    merged_branches="$(git branch --merged "$default_branch" --no-contains "$default_branch" --format='%(refname:short)')";
+
+    [ "$merged_branches" ] && git branch --delete "$merged_branches"
+}
+cleanup_remote() {
+    default_branch="$(get_default_branch)";
+
+    merged_branches="$(git branch --remotes --merged "$default_branch" --no-contains "$default_branch" --format='%(refname:short)' | sed 's|origin/||')";
+
+    [ "$merged_branches" ] && git push --delete origin "$merged_branches"
+}
+
+
+
+remote=false;
+for arg in "$@"; do
+    case "$arg" in
+        "--help" | "-h")
+            help;
+            exit 0;
+            ;;
+       "--version" | "-v")
+            version;
+            exit 0;
+            ;;
+        "--remote" | "-r")
+            remote=true;
+            ;;
+    esac
+done
+
+
+
+
+if [ "$remote" = "true" ]; then
+    cleanup_remote;
+elif [ "$remote" = "false" ]; then
+    cleanup;
+else
+    die "BUG: 'remote' is not true or false but: '$remote'";
+fi
+
+# vim: ft=sh
diff --git a/pkgs/by-name/gi/git-cleanup/package.nix b/pkgs/by-name/gi/git-cleanup/package.nix
new file mode 100644
index 00000000..e9aab772
--- /dev/null
+++ b/pkgs/by-name/gi/git-cleanup/package.nix
@@ -0,0 +1,15 @@
+{
+  sysLib,
+  git,
+  gnused,
+}:
+sysLib.writeShellScript {
+  name = "git-cleanup";
+  src = ./git-cleanup.sh;
+  keepPath = false;
+  generateCompletions = true;
+  dependencies = [
+    git
+    gnused
+  ];
+}