tiyn/dotfiles
1
0
Fork 0
mirror of https://github.com/tiyn/dotfiles.git synced 2025-04-01 17:07:45 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TiynGER 2020-03-29 11:46:32 +02:00
parent eeb966e1b6
commit 46fce77dd2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.local/bin/suckless/suckclean
View File

@ -1,2 +1,2 @@
#!/bin/zsh #!/bin/zsh
make clean && rm -f config.h && reset --hard origin/master make clean && rm -f config.h && git reset --hard origin/base

6
.local/bin/suckless/suckdiff
View File

@ -1,6 +1,6 @@
#!/usr/bin/zsh #!/usr/bin/zsh
git checkout master && git checkout master &&
dotfiles="/home/drew/.config/dotfiles/suckless" dotfiles="/home/tiynger/.config/dotfiles/suckless"
project=$(basename $(pwd)) project=$(basename $(pwd))
diffdir="${dotfiles}/${project}_diffs/" diffdir="${dotfiles}/${project}_diffs/"
olddiffdir="${dotfiles}/${project}_diffs/old/" olddiffdir="${dotfiles}/${project}_diffs/old/"
@ -8,10 +8,10 @@ rm -rf "$olddiffdir" &&
mkdir -p "$olddiffdir" && mkdir -p "$olddiffdir" &&
mkdir -p "$diffdir" && mkdir -p "$diffdir" &&
mv "$diffdir"*.diff "$olddiffdir" || true && 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 for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
if [ "$branch" != "master" ];then if [ "$branch" != "master" ];then
git diff master..$branch > "${diffdir}${project}_${branch}.diff" git diff base..$branch > "${diffdir}${project}_${branch}.diff"
fi fi
done done

4
.local/bin/suckless/suckmerge
View File

@ -1,8 +1,8 @@
#!/bin/zsh #!/bin/zsh
suckdiff && 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 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 echo $branch
git merge $branch -m $branch git merge $branch -m $branch
fi fi