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

Christian Ehrhardt christian.ehrhardt at canonical.com
Fri Dec 3 08:53:23 CET 2021


On Fri, Dec 3, 2021 at 8:51 AM <christian.ehrhardt at canonical.com> wrote:
>
> From: Christian Ehrhardt <christian.ehrhardt at canonical.com>

Hmm, that probably should go to dev@ instead since that is where the
script lives - resubmitting

> 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 at 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
> --
> 2.34.0
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd


More information about the stable mailing list