diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 15:35:19 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 15:35:19 +0000 |
commit | b7e8d5af06ee840cc48217ca4629cf28aeeb3c50 (patch) | |
tree | 6aa8dc840b085de50db46e2ad0725eae248fef02 /debian/git-cherry-pick | |
parent | Adding upstream version 252.22. (diff) | |
download | systemd-b7e8d5af06ee840cc48217ca4629cf28aeeb3c50.tar.xz systemd-b7e8d5af06ee840cc48217ca4629cf28aeeb3c50.zip |
Adding debian version 252.22-1~deb12u1.debian/252.22-1_deb12u1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | debian/git-cherry-pick | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/debian/git-cherry-pick b/debian/git-cherry-pick new file mode 100755 index 0000000..1fabd32 --- /dev/null +++ b/debian/git-cherry-pick @@ -0,0 +1,53 @@ +#!/bin/bash + +set -e + +if [ -z "$*" ] ; then + echo "Usage: $0 [commit [commit ..]]" + exit 1 +fi + + +curbranch=$(git rev-parse --abbrev-ref HEAD) + +# assert we got a branch +[ -n "$curbranch" ] + +if [ $curbranch = HEAD ] ; then + echo "You are not currently on a branch, cannot cherry-pick" + exit 1 +fi + +case $curbranch in + patch-queue/*) + debbranch=${curbranch/patch-queue\/} + pqbranch=$curbranch + ;; + *) + debbranch=$curbranch + pqbranch=patch-queue/$curbranch + ;; +esac + +commits=$(git rev-parse "$@") + +if git rev-parse $pqbranch &>/dev/null ; then + echo + echo "Will recreate patch-queue branch $pqbranch" + echo "It was pointing to" $(git rev-parse $pqbranch) + echo +fi + +gbp pq import --force + +echo "Cherry-picking the following commits:" +echo "$commits" + +picks=$(echo "$commits" | xargs echo exec git cherry-pick -x --no-edit --commit) + +# find the first debian commit +firstdebian=$(git log -i --grep "topic.*debian" --pretty=%h --reverse $debbranch..$pqbranch | head -1) + +sedexpr="/$firstdebian/i$picks" + +GIT_EDITOR="sed -i -e '$sedexpr'" git rebase --interactive --no-autosquash $debbranch |