swytch/dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fix: fix flags counting in dot

Browse Source 
ignore git flags (--*)

correct merging error message
This commit is contained in:
David 2021-01-13 00:47:39 +01:00
parent c07b1b9a8e
commit 5c385ece97
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.local/bin/dot
View File

@ -13,6 +13,7 @@ flags="false"
for arg in $@ for arg in $@
do do
case $arg in case $arg in
--*) ;;
-*) [ "$flags" = "true" ] && flags="error" && break || flags="true" ;; -*) [ "$flags" = "true" ] && flags="error" && break || flags="true" ;;
esac esac
done done
@ -42,7 +43,7 @@ case $1 in
[ "$1" = "-d" ] && shift && cmd="$git diff $@" && break [ "$1" = "-d" ] && shift && cmd="$git diff $@" && break
if [ "$1" = "-m" ] ; then if [ "$1" = "-m" ] ; then
shift shift
[ "$1" = "" ] && echo "Please provide a branche to merge from" && exit 1 [ "$1" = "" ] && echo "Please provide a branche to merge into" && exit 1
if [ "$1" != "-a" ] ; then if [ "$1" != "-a" ] ; then
while [ "$1" != "" ] ; do while [ "$1" != "" ] ; do
$git checkout $1 && $git merge dev $git checkout $1 && $git merge dev