On Mon, Oct 16, 2023 at 11:29 AM A. Sverdlin
<alexander.sverd...@siemens.com> 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. Drop additional options from git-am --abort but add
> them to second attempt.
While not required, it is better to keep the patch simpler / smaller and just
add the options to the second attempt.
Nothing is hurt with them on --abort, so let's leave them there.
Bruce
>
> 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>
> ---
> tools/kgit-s2q | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/kgit-s2q b/tools/kgit-s2q
> index 79de243..e9408af 100755
> --- a/tools/kgit-s2q
> +++ b/tools/kgit-s2q
> @@ -572,15 +572,15 @@ do
> fi
> git am $git_am_options --keep-non-patch $DIR/$i > /dev/null 2>&1
> if [ $? != 0 ];then
> - git am $git_am_options --abort > /dev/null 2>&1
> + git am --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
> continue
> fi
> - git am $git_am_options --abort > /dev/null 2>&1
> + git am --abort > /dev/null 2>&1
> echo "[INFO]: Context reduced git-am of $DIR/$i with \"git
> am\" did not work, trying \"apply\"."
> else
> commit=$(git rev-parse HEAD)
> --
> 2.41.0
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13189):
https://lists.yoctoproject.org/g/linux-yocto/message/13189
Mute This Topic: https://lists.yoctoproject.org/mt/101998832/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]
-=-=-=-=-=-=-=-=-=-=-=-
