chore: 🔧 refactor gitutils

Author: tomgrv

src/gitutils/_fixup.sh

@@ -1,5 +1,18 @@
 #!/bin/sh
 
+set -e
+
+# Source colors script
+. zz_colors
+
+# Function to print help and manage arguments
+eval $(
+	zz_args "Fix git history" $0 "$@" <<-help
+		    f -        force     allow overwritting pushed history
+			- sha      sha       sha commit to fixup
+	help
+)
+
 ## Do not fixup if staged files contains composer.lock or package-lock.json
 if [ -n "$(git diff --cached --name-only | grep -E 'composer.lock|package-lock.json')" ]; then
 	echo 'Packages lock file are staged, fixup is not allowed.'
@@ -12,43 +25,32 @@ cd "$(git rev-parse --show-toplevel)" >/dev/null
 #### Integrate modifications from remote
 git fetch --progress --prune --recurse-submodules=no origin >/dev/null
 
-#### Display help
-if [ "$1" = '--help' ]; then
-	echo 'Usage: git fixup [--force|<commit>]'
-	exit 0
-fi
-
 #### Check if fixup commit exists
-echo 'Check if fixup commit exists...'
-if ! git isFixup; then
-
-	## Do not fixup if no files are staged
-	if [ -z "$(git diff --cached --name-only)" ]; then
-		echo 'No files are staged, fixup is not allowed.'
-		exit 1
-	fi
-
-	#### Get commit to fixup
-
-	sha=$(git getcommit "$@")
+if git isFixup; then
+	zz_log e 'Fixup commit found, please continue rebasing...'
+	exit 1
+fi
 
-	#### Display commit to fixup
-	echo 'Fixup commit given:' $sha
+## Do not fixup if no files are staged
+if [ -z "$(git diff --cached --name-only)" ]; then
+	zz_log e 'No files are staged, fixup is not allowed.'
+	exit 1
+fi
 
-	## Create fixup commit and exit if commit is not done
-	if ! git commit --fixup $sha --no-verify; then
-		echo 'Fixup commit failed...'
-		exit 1
-	fi
+#### Get commit to fixup
+sha=$(git getcommit $sha)
 
-	#### Start rebase
-	git rebase -i --autosquash $sha~ --autostash --no-verify --exec '[ -f .git/hooks/pre-commit ] && (.git/hooks/pre-commit --name-only HEAD HEAD~1 && git commit --amend --no-edit --no-verify) || true'
-else
-	echo -e "\e[32mExisting !fixup commit found. Continue rebasing...\e[0m"
+#### Display commit to fixup
+zz_log i "Fixup commit given: $sha"
 
-	#### Stage all changes
-	git add --update && git rebase --continue
+## Create fixup commit and exit if commit is not done
+if ! git commit --fixup $sha --no-verify; then
+	zz_log e 'Fixup commit failed...'
+	exit 1
 fi
 
+#### Start rebase
+git rebase -i --autosquash $sha~ --autostash --no-verify --exec '[ -f .git/hooks/pre-commit ] && (.git/hooks/pre-commit --name-only HEAD HEAD~1 && git commit --amend --no-edit --no-verify) || true'
+
 #### Back to previous directory
 cd - >/dev/null

src/gitutils/devcontainer-feature.json

@@ -2,7 +2,7 @@
     "id": "gitutils",
     "name": "Git Aliases",
     "description": "A feature to add useful Git aliases to your shell.",
-    "version": "5.4.3",
+    "version": "5.5.0",
     "dependsOn": {
         "ghcr.io/devcontainers/features/node:1": "lts",
         "ghcr.io/tomgrv/devcontainer-features/common-utils:3": {