mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-03-14 11:31:59 +01:00
Code Issues Projects Releases Wiki Activity

SCRIPTS: git-show-backports: add a restart-from-last option

Browse Source 
It's always a bit tricky to avoid already backported patches when they
just got a different ID (e.g. a critical fix in a topic branch). Most
often with stable topic branches we just want to pick all stable commits
since the last backported one. New option -L instead of -m does exactly
this: it enumerates only commits that were added to the reference branch
after its most recent backport.
This commit is contained in:
Willy Tarreau 2026-03-09 15:20:35 +01:00
parent 459835d535
commit 520faedda0
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/git-show-backports
View File

@ -28,7 +28,7 @@
# show-backports -q -m -r hapee-r2 hapee-r1
USAGE="Usage: ${0##*/} [-q] [-H] [-m] [-u] [-r reference] [-l logexpr] [-s subject] [-b base] {branch|range} [...] [-- file*]"
USAGE="Usage: ${0##*/} [-q] [-H] [-m] [-u] [-L] [-r reference] [-l logexpr] [-s subject] [-b base] {branch|range} [...] [-- file*]"
BASES=( )
BRANCHES=( )
REF=
@ -39,6 +39,7 @@ SUBJECT=
MISSING=
UPSTREAM=
BODYHASH=
SINCELAST=
die() {
[ "$#" -eq 0 ] || echo "$*" >&2
@ -70,7 +71,7 @@ dump_commit_matrix() {
count=0
# now look up commits
while read ref subject; do
if [ -n "$MISSING" -a "${subject:0:9}" = "[RELEASE]" ]; then
if [ -n "$MISSING" -o -n "$SINCELAST" ] && [ "${subject:0:9}" = "[RELEASE]" ]; then
continue
fi
@ -153,6 +154,7 @@ while [ -n "$1" -a -z "${1##-*}" ]; do
-m) MISSING=1 ; shift ;;
-u) UPSTREAM=1 ; shift ;;
-H) BODYHASH=1 ; shift ;;
-L) SINCELAST=1 ; shift ;;
-h|--help) quit "$USAGE" ;;
*) die "$USAGE" ;;
esac
@ -297,9 +299,23 @@ dump_commit_matrix | column -t | \
(
left_commits=( )
right_commits=( )
since_last=( )
last_bkp=$BASE
while read line; do
# append the subject at the end of the line
set -- $line
if [ -n "$SINCELAST" ]; then
if [ "${line::1}" = ":" ]; then
continue
fi
if [ "$2" != "-" ]; then
last_bkp="$1"
since_last=( )
else
since_last[${#since_last[@]}]="$1"
fi
continue
fi
echo -n "$line "
if [ "${line::1}" = ":" ]; then
echo "---- Subject ----"
@ -315,7 +331,14 @@ dump_commit_matrix | column -t | \
right_commits[${#right_commits[@]}]="$comm"
fi
done
if [ -n "$MISSING" -a ${#left_commits[@]} -eq 0 ]; then
if [ -n "$SINCELAST" -a ${#since_last[@]} -eq 0 ]; then
echo "No new commit upstream since last commit $last_bkp."
elif [ -n "$SINCELAST" ]; then
echo "Found ${#since_last[@]} commit(s) added to branch $REF since last backported commit $last_bkp:"
echo
echo " git cherry-pick -sx ${since_last[@]}"
echo
elif [ -n "$MISSING" -a ${#left_commits[@]} -eq 0 ]; then
echo "No missing commit to apply."
elif [ -n "$MISSING" ]; then
echo