merged.
This will be in my next kernel pull request.
Bruce
In message: [yocto-kernel-tools][PATCH v2] kgit-s2q: use additional git-am
options with reduced context as well
on 16/10/2023 A. Sverdlin wrote:
> From: Alexander Sverdlin <alexander.sverd...@siemens.com>
>
> "--committer-date-is-author-date" makes little sense for git-am --abort,
> but a lot of sense for the seconds git-am attempt (with -C1, reduced
> context), because poorly-formatted patches still cause non-reproducible
> builds in this case. Add them to second attempt.
>
> Cc: Bruce Ashfield <bruce.ashfi...@gmail.com>
> Fixes: dbf6fc9a0191 ("kgit-s2q: allow author date to be used instead of
> current time/date")
> Co-developed-by: Michal Seben <michal.se...@siemens.com>
> Signed-off-by: Alexander Sverdlin <alexander.sverd...@siemens.com>
> ---
> Changelog:
> v2: Keep $git_am_options within --abort invocations
>
> tools/kgit-s2q | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/kgit-s2q b/tools/kgit-s2q
> index 79de243..2561121 100755
> --- a/tools/kgit-s2q
> +++ b/tools/kgit-s2q
> @@ -574,7 +574,7 @@ do
> if [ $? != 0 ];then
> git am $git_am_options --abort > /dev/null 2>&1
> echo "[INFO]: check of $DIR/$i with \"git am\" did not pass,
> trying reduced context."
> - git am -C1 --keep-non-patch $DIR/$i > /dev/null 2>&1
> + git am $git_am_options -C1 --keep-non-patch $DIR/$i > /dev/null
> 2>&1
> if [ $? = 0 ]; then
> commit=$(git rev-parse HEAD)
> echo $DIR/$i $commit >> $REFRESH
> --
> 2.41.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13198):
https://lists.yoctoproject.org/g/linux-yocto/message/13198
Mute This Topic: https://lists.yoctoproject.org/mt/102000637/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
