From: Georgi Gerganov <redacted>
Date: Fri, 29 Dec 2023 13:00:46 +0000 (+0200)
Subject: scripts : do not sync commits from this repo
X-Git-Tag: upstream/1.7.4~1189
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=2623640cd6b8e077ffb1fbe3c265208da3a0ca6d;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

scripts : do not sync commits from this repo
---

diff --git a/extra/sync-ggml-am.sh b/extra/sync-ggml-am.sh
index 48be256c..0b8e55ac 100755
--- a/extra/sync-ggml-am.sh
+++ b/extra/sync-ggml-am.sh
@@ -27,21 +27,36 @@ echo "Syncing ggml changes since commit $lc"
 cd $SRC_GGML
 
 git log --oneline $lc..HEAD
+git log --oneline $lc..HEAD | grep -v "(whisper/[0-9]*)" | cut -d' ' -f1 > $SRC_WHISPER/ggml-commits
 
-git format-patch $lc --stdout -- \
-    include/ggml/ggml*.h \
-    src/ggml*.h \
-    src/ggml*.c \
-    src/ggml*.cpp \
-    src/ggml*.m \
-    src/ggml*.metal \
-    src/ggml*.cu \
-    tests/test-opt.cpp \
-    tests/test-grad0.cpp \
-    tests/test-quantize-fns.cpp \
-    tests/test-quantize-perf.cpp \
-    tests/test-backend-ops.cpp \
-    > $SRC_WHISPER/ggml-src.patch
+if [ ! -s $SRC_WHISPER/ggml-commits ]; then
+    rm -v $SRC_WHISPER/ggml-commits
+    echo "No new commits"
+    exit 0
+fi
+
+if [ -f $SRC_WHISPER/ggml-src.patch ]; then
+    rm -v $SRC_WHISPER/ggml-src.patch
+fi
+
+while read c; do
+    git format-patch -k $c~1..$c --stdout -- \
+        include/ggml/ggml*.h \
+        src/ggml*.h \
+        src/ggml*.c \
+        src/ggml*.cpp \
+        src/ggml*.m \
+        src/ggml*.metal \
+        src/ggml*.cu \
+        tests/test-opt.cpp \
+        tests/test-grad0.cpp \
+        tests/test-quantize-fns.cpp \
+        tests/test-quantize-perf.cpp \
+        tests/test-backend-ops.cpp \
+        >> $SRC_WHISPER/ggml-src.patch
+done < $SRC_WHISPER/ggml-commits
+
+rm -v $SRC_WHISPER/ggml-commits
 
 # delete files if empty
 if [ ! -s $SRC_WHISPER/ggml-src.patch ]; then
diff --git a/extra/sync-ggml.last b/extra/sync-ggml.last
index 3b196fa5..9166e0fa 100644
--- a/extra/sync-ggml.last
+++ b/extra/sync-ggml.last
@@ -1 +1 @@
-1467a4eb71bdb5ac316d248a7f3f26cdadc56b68
+965137f49917768959679a9e860dc414e170fd55