From 05eab9e0b660b5c670bcb5ae2a6b2ddd28d11a35 Mon Sep 17 00:00:00 2001
From: TiynGER <kantemarten@googlemail.com>
Date: Sun, 29 Mar 2020 11:46:32 +0200
Subject: [PATCH] changing suckless merge utils for having a base branch to
 ensure the master can be pushed with all features to ensure buildability
 without this utils

---
 .local/bin/suckless/suckclean | 2 +-
 .local/bin/suckless/suckdiff  | 6 +++---
 .local/bin/suckless/suckmerge | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.local/bin/suckless/suckclean b/.local/bin/suckless/suckclean
index 1926078..5fd3b4a 100755
--- a/.local/bin/suckless/suckclean
+++ b/.local/bin/suckless/suckclean
@@ -1,2 +1,2 @@
 #!/bin/zsh
-make clean && rm -f config.h && reset --hard origin/master
+make clean && rm -f config.h && git reset --hard origin/base
diff --git a/.local/bin/suckless/suckdiff b/.local/bin/suckless/suckdiff
index bbd365b..b20bbe3 100755
--- a/.local/bin/suckless/suckdiff
+++ b/.local/bin/suckless/suckdiff
@@ -1,6 +1,6 @@
 #!/usr/bin/zsh
 git checkout master &&
-dotfiles="/home/drew/.config/dotfiles/suckless"
+dotfiles="/home/tiynger/.config/dotfiles/suckless"
 project=$(basename $(pwd))
 diffdir="${dotfiles}/${project}_diffs/"
 olddiffdir="${dotfiles}/${project}_diffs/old/"
@@ -8,10 +8,10 @@ rm -rf "$olddiffdir" &&
 mkdir -p "$olddiffdir" &&
 mkdir -p "$diffdir" &&
 mv "$diffdir"*.diff "$olddiffdir" || true &&
-make clean && rm -f config.h && git reset --hard origin/master &&
+make clean && rm -f config.h && git reset --hard origin/base &&
 for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
 	if [ "$branch" != "master" ];then
-		git diff master..$branch > "${diffdir}${project}_${branch}.diff"
+		git diff base..$branch > "${diffdir}${project}_${branch}.diff"
 	fi
 done
 
diff --git a/.local/bin/suckless/suckmerge b/.local/bin/suckless/suckmerge
index b8a0142..e4641eb 100755
--- a/.local/bin/suckless/suckmerge
+++ b/.local/bin/suckless/suckmerge
@@ -1,8 +1,8 @@
 #!/bin/zsh
 suckdiff &&
-git reset --hard origin/master &&
+git reset --hard origin/base &&
 for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
-	if [ "$branch" != "master" ];then
+	if [[ ("$branch" != "master") && ("$branch" != "base") ]];then
 		echo $branch
 		git merge $branch -m $branch
 	fi