diff mbox series

[v2,2/2] devtools: report commit id on partial fixes

Message ID 20211203075415.4083502-2-christian.ehrhardt@canonical.com (mailing list archive)
State New
Delegated to: Thomas Monjalon
Headers show
Series [v2,1/2] devtools: don't include headline "fix" in backports | expand

Checks

Context Check Description
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Performance fail Performance Testing issues
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch warning coding style issues

Commit Message

Christian Ehrhardt Dec. 3, 2021, 7:54 a.m. UTC
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>

The candidate list for backports lists partial fixes like:
 "(21.02 (partially fixed in 21.08))"
That is useful to identify fixes menat for later releases, but
indirectly applying to older ones as well.

While the devscript has no access to the stable tree to fully check
if the respective interim commit is present there, reporting the commit
id will still help to check it later - because only if the interim commit
id is in the stable tree, then also the new fix is a real candidate
for backporting.

The above would become "(21.02 (partially fixed in c30751afc360 @ 21.08))"

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 devtools/git-log-fixes.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Luca Boccassi Dec. 3, 2021, 12:24 p.m. UTC | #1
On Fri, 2021-12-03 at 08:54 +0100, christian.ehrhardt@canonical.com
wrote:
> From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> 
> The candidate list for backports lists partial fixes like:
>  "(21.02 (partially fixed in 21.08))"
> That is useful to identify fixes menat for later releases, but
> indirectly applying to older ones as well.
> 
> While the devscript has no access to the stable tree to fully check
> if the respective interim commit is present there, reporting the commit
> id will still help to check it later - because only if the interim commit
> id is in the stable tree, then also the new fix is a real candidate
> for backporting.
> 
> The above would become "(21.02 (partially fixed in c30751afc360 @ 21.08))"
> 
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
>  devtools/git-log-fixes.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
> index 27ec9088d4..a1b548948a 100755
> --- a/devtools/git-log-fixes.sh
> +++ b/devtools/git-log-fixes.sh
> @@ -76,7 +76,7 @@ origin_version () # <origin_hash> ...
>  			# look chained fix of fix recursively
>  			local rootver="$(origin_version $roothashes)"
>  			[ -n "$rootver" ] || continue
> -			echo "$rootver (partially fixed in $origver)"
> +			echo "$rootver (partially fixed in $origin @ $origver)"
>  		else
>  			echo "$origver"
>  		fi

Acked-by: Luca Boccassi <bluca@debian.org>
Kevin Traynor Dec. 3, 2021, 2:05 p.m. UTC | #2
On 03/12/2021 07:54, christian.ehrhardt@canonical.com wrote:
> From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> 
> The candidate list for backports lists partial fixes like:
>   "(21.02 (partially fixed in 21.08))"
> That is useful to identify fixes menat for later releases, but
> indirectly applying to older ones as well.
> 
> While the devscript has no access to the stable tree to fully check
> if the respective interim commit is present there, reporting the commit
> id will still help to check it later - because only if the interim commit
> id is in the stable tree, then also the new fix is a real candidate
> for backporting.
> 
> The above would become "(21.02 (partially fixed in c30751afc360 @ 21.08))"
> 
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
>   devtools/git-log-fixes.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
> index 27ec9088d4..a1b548948a 100755
> --- a/devtools/git-log-fixes.sh
> +++ b/devtools/git-log-fixes.sh
> @@ -76,7 +76,7 @@ origin_version () # <origin_hash> ...
>   			# look chained fix of fix recursively
>   			local rootver="$(origin_version $roothashes)"
>   			[ -n "$rootver" ] || continue
> -			echo "$rootver (partially fixed in $origver)"
> +			echo "$rootver (partially fixed in $origin @ $origver)"
>   		else
>   			echo "$origver"
>   		fi
> 

Acked-by: Kevin Traynor <ktraynor@redhat.com>
Xueming Li Dec. 5, 2021, 11:35 a.m. UTC | #3
On Fri, 2021-12-03 at 08:54 +0100, christian.ehrhardt@canonical.com
wrote:
> From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> 
> The candidate list for backports lists partial fixes like:
>  "(21.02 (partially fixed in 21.08))"
> That is useful to identify fixes menat for later releases, but
> indirectly applying to older ones as well.
> 
> While the devscript has no access to the stable tree to fully check
> if the respective interim commit is present there, reporting the commit
> id will still help to check it later - because only if the interim commit
> id is in the stable tree, then also the new fix is a real candidate
> for backporting.
> 
> The above would become "(21.02 (partially fixed in c30751afc360 @ 21.08))"
> 
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
>  devtools/git-log-fixes.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
> index 27ec9088d4..a1b548948a 100755
> --- a/devtools/git-log-fixes.sh
> +++ b/devtools/git-log-fixes.sh
> @@ -76,7 +76,7 @@ origin_version () # <origin_hash> ...
>  			# look chained fix of fix recursively
>  			local rootver="$(origin_version $roothashes)"
>  			[ -n "$rootver" ] || continue
> -			echo "$rootver (partially fixed in $origver)"
> +			echo "$rootver (partially fixed in $origin @ $origver)"
>  		else
>  			echo "$origver"
>  		fi

Acked-by: Xueming Li <xuemingl@nvidia.com>
diff mbox series

Patch

diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
index 27ec9088d4..a1b548948a 100755
--- a/devtools/git-log-fixes.sh
+++ b/devtools/git-log-fixes.sh
@@ -76,7 +76,7 @@  origin_version () # <origin_hash> ...
 			# look chained fix of fix recursively
 			local rootver="$(origin_version $roothashes)"
 			[ -n "$rootver" ] || continue
-			echo "$rootver (partially fixed in $origver)"
+			echo "$rootver (partially fixed in $origin @ $origver)"
 		else
 			echo "$origver"
 		fi