Merge branch 'latest' into net

Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>

Dockerfile

@@ -77,7 +77,7 @@ RUN cd /opt && \
 
 # iproute
 ARG IPROUTE2_GIT_URL="git://git.kernel.org/pub/scm/network/iproute2/iproute2.git"
-ARG IPROUTE2_GIT_SHA="v6.12.0"
+ARG IPROUTE2_GIT_SHA="v6.13.0"
 RUN cd /opt && \
 	git clone "${IPROUTE2_GIT_URL}" iproute2 && \
 	cd iproute2 && \

sync_push.sh

@@ -1,10 +1,23 @@
 #! /bin/bash
 
-git checkout latest
+STASHED=0
+
+if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
+	echo "There are modified files that might be wiped during the update. Stashing them."
+	git stash
+	STASHED=1
+fi
+
+git switch latest
 git push
 
-git checkout net
+git switch net
 git merge --signoff --no-edit latest
 git push
 
-git checkout latest
+git switch latest
+
+if [ ${STASHED} -eq 1 ]; then
+	echo "Unstashing modifications from before the update."
+	git stash pop
+fi