From: Georgi Gerganov <redacted>
Date: Fri, 29 Dec 2023 13:17:18 +0000 (+0200)
Subject: scripts : do not sync synced commits
X-Git-Tag: upstream/0.0.1642~1141
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=e67a04f1188c0400648b161d01a08a57d147f28a;p=pkg%2Fggml%2Fsources%2Fggml

scripts : do not sync synced commits
---

diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
index b5f23f96..422a0e6b 100755
--- a/scripts/sync-llama-am.sh
+++ b/scripts/sync-llama-am.sh
@@ -27,7 +27,7 @@ echo "Syncing llama.cpp changes since commit $lc"
 cd $SRC_LLAMA
 
 git log --oneline $lc..HEAD
-git log --oneline $lc..HEAD | grep -v "(ggml/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/llama-commits
+git log --oneline $lc..HEAD | grep -v "(ggml/[0-9]*)" | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/llama-commits
 
 if [ ! -s $SRC_GGML/llama-commits ]; then
     rm -v $SRC_GGML/llama-commits
diff --git a/scripts/sync-llama.last b/scripts/sync-llama.last
index 21b783f1..584d1504 100644
--- a/scripts/sync-llama.last
+++ b/scripts/sync-llama.last
@@ -1 +1 @@
-38b3de4658292582a8941a2be5c77b40ce6ac0f2
+c8255f8a6b2a3b3ebc6cb340cc2487f39fc95ffc
diff --git a/scripts/sync-whisper-am.sh b/scripts/sync-whisper-am.sh
index 5855e356..190d2225 100755
--- a/scripts/sync-whisper-am.sh
+++ b/scripts/sync-whisper-am.sh
@@ -27,7 +27,7 @@ echo "Syncing whisper.cpp changes since commit $lc"
 cd $SRC_WHISPER
 
 git log --oneline $lc..HEAD
-git log --oneline $lc..HEAD | grep -v "(ggml/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/whisper-commits
+git log --oneline $lc..HEAD | grep -v "(ggml/[0-9]*)" | grep -v "(llama/[0-9]*)" | cut -d' ' -f1 > $SRC_GGML/whisper-commits
 
 if [ ! -s $SRC_GGML/whisper-commits ]; then
     rm -v $SRC_GGML/whisper-commits