From 16846fd79e6af797506abb175c883836323d7382 Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 21 Jan 2025 12:23:03 +0100 Subject: [PATCH 1/2] docker: iproute: switch to v6.13 Latest version. Signed-off-by: Matthieu Baerts (NGI0) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d288d5b..75a3b0b 100644 --- a/Dockerfile +++ b/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 && \ From 2d412e8461ddfa7af75734b90d9f3e6cc6d0bb44 Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 21 Jan 2025 12:29:39 +0100 Subject: [PATCH 2/2] sync push: auto-stash/unstash Easier, instead of failing in the middle, or thinking about having to do that manually before. While at it, use 'git switch' instead of 'git checkout'. Signed-off-by: Matthieu Baerts (NGI0) --- sync_push.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sync_push.sh b/sync_push.sh index c22187c..f3669c9 100755 --- a/sync_push.sh +++ b/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