From 8663dc3189108b1be6c4791631de935b10b440e6 Mon Sep 17 00:00:00 2001 From: pika Date: Mon, 26 May 2025 15:26:54 +0200 Subject: [PATCH] now everything works --- .zsh/.aliases.zsh | 17 ++++++++++------- .zsh/themes | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.zsh/.aliases.zsh b/.zsh/.aliases.zsh index daff26c..4292325 100644 --- a/.zsh/.aliases.zsh +++ b/.zsh/.aliases.zsh @@ -479,16 +479,19 @@ __git__() { # Check if there are any changes on the remote branch if git diff --quiet "$branch" "origin/$branch"; then + local commit_files + local commit_message - if [ -n $2 ]; then - local commit_files="${1:-.}" - local commit_message="${2:-wip}" + if [ -n "$2" ]; then + commit_files="$1" + commit_message="$2" else - if [ ! -f "$1" ]; then - local commit_message="$1" + if [ -e "$1" ]; then + commit_files="$1" + commit_message="wip" else - local commit_files="${1:-.}" - local commit_message="wip" + commit_files="." + commit_message="$1" fi fi diff --git a/.zsh/themes b/.zsh/themes index 2f2e83d..485765f 160000 --- a/.zsh/themes +++ b/.zsh/themes @@ -1 +1 @@ -Subproject commit 2f2e83d1969ace629e766357f07b7e4fb5fd3f21 +Subproject commit 485765f75123eb8f94663d3187d69c393934849e