Improve ggml update

diff --git a/Makefile b/Makefile
index bd2ec5a3f628e0de16c54caadaae0c0d4b9d545c..f14b1c356fab2015824ae29afaddc0f4bc990c2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,13 @@ GGML_BASE=sources/ggml
 update-ggml:
        # switch to upstream branches and tag a commit
        git -C $(GGML_BASE) switch master
-       git -C $(GGML_BASE) pull --tags github master
+       git -C $(GGML_BASE) pull github master
        git -C $(GGML_BASE) switch upstream/latest
-       git -C $(GGML_BASE) pull --tags github master
+       git -C $(GGML_BASE) pull github master
        
        $(eval GGML_BUILD_NUMBER = $(shell git -C $(GGML_BASE) rev-list --count $(GGML_CHECKOUT)))
        @echo "GGML_BUILD_NUMBER=$(GGML_BUILD_NUMBER)"
+       -git -C $(GGML_BASE) tag --delete upstream/0.0.$(GGML_BUILD_NUMBER)
        git -C $(GGML_BASE) tag -a -m "Pinned upstream commit" upstream/0.0.$(GGML_BUILD_NUMBER) $(GGML_CHECKOUT)
        
        # Import patches before merging
@@ -39,5 +40,6 @@ update-ggml:
        echo "" >> $(GGML_BASE)/debian/changelog
        echo " -- Mathieu Baudier <mbaudier@argeo.org>  $(shell date --utc '+%a, %d %b %+4Y %T %z')" >> $(GGML_BASE)/debian/changelog
        
-       git commit -m "Update upstream"
+       git -C $(GGML_BASE) add --all
+       git -C $(GGML_BASE) commit -m "Update upstream"