1
0

2 Commitit dc15cccc8f ... b612500b9d

Tekijä SHA1 Viesti Päivämäärä
  seno b612500b9d dev 1 kuukausi sitten
  seno 89effff048 build: Update google-generativeai version to 0.8.5 2 kuukautta sitten
4 muutettua tiedostoa jossa 4 lisäystä ja 14 poistoa
  1. 1 1
      Dockerfile
  2. 1 1
      Makefile
  3. 2 9
      ai-rebase.sh
  4. 0 3
      git_rebase_ai.py

+ 1 - 1
Dockerfile

@@ -14,7 +14,7 @@ ENV HOME=/home/appuser
 RUN groupadd -r appgroup && useradd --no-log-init -r -g appgroup -d /home/appuser -m appuser
 
 # Install any necessary dependencies (in this case, just the google-generativeai library)
-RUN pip install --no-cache-dir google-generativeai
+RUN pip install --no-cache-dir google-generativeai==0.8.5
 
 # Copy the Python script into the container
 COPY git_rebase_ai.py /app/

+ 1 - 1
Makefile

@@ -3,7 +3,7 @@
 # === Variables ===
 # Override these on the command line like: make build IMAGE_TAG=2.0
 IMAGE_NAME ?= senomas/git-rebase
-IMAGE_TAG  ?= 1.0
+IMAGE_TAG  ?= 1.2
 # Full image reference used in commands
 FULL_IMAGE_NAME = $(IMAGE_NAME):$(IMAGE_TAG)
 

+ 2 - 9
ai-rebase.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-VERSION=1.0
+VERSION=1.2
 
 echo "AI-Rebase v$VERSION"
 
@@ -15,18 +15,11 @@ if [ ! -f "$HOME/.git-credentials" ]; then
 	exit 1
 fi
 
-if [ ! "$1" = "--delete-backups" ]; then
-	IFS='/' read -r part1 part2 <<<"$1"
-
-	echo git fetch $part1 $part2
-	git fetch $part1 $part2
-fi
-
 docker run --rm -it \
 	-v "$(pwd):/repo" \
 	-v "$HOME/.gitconfig:/home/appuser/.gitconfig:ro" \
 	-v "$HOME/.git-credentials:/home/appuser/.git-credentials:ro" \
 	-e GEMINI_API_KEY="$GEMINI_API_KEY" \
-	-e GEMINI_MODEL="${GEMINI_MODEL:-gemini-2.0-flash}" \
+	-e GEMINI_MODEL="${GEMINI_MODEL:-gemini-1.5-flash}" \
 	-u "$(id -u):$(id -g)" \
 	"senomas/git-rebase:$VERSION" "$@"

+ 0 - 3
git_rebase_ai.py

@@ -1548,9 +1548,6 @@ def main():
         logging.error("This script must be run from within a Git repository.")
         sys.exit(1)
 
-    if not check_git_status():
-        sys.exit(1)  # Exit if working directory is not clean
-
     # Handle --delete-backups flag first
     if args.delete_backups:
         current_branch = get_current_branch()