On Wed, Nov 11, 2020 at 10:49:24AM +0100, Jiri Benc wrote: > On Tue, 10 Nov 2020 22:49:53 -0000, GitLab Bridge on behalf of bcrocker wrote: > > diff --git a/redhat/Makefile b/redhat/Makefile > > index 555dea25ea0f..e7ba07066177 100644 > > --- a/redhat/Makefile > > +++ b/redhat/Makefile > > @@ -393,7 +393,7 @@ dist-dump-variables: > > @$(REDHAT)/dist-dump-variables.sh > > > > dist-self-test: > > - @if dnf list installed bats >& /dev/null; then \ > > + @if test -x /usr/bin/bats >& /dev/null; then \ > > bats $(REDHAT)/self-test/*.bats ; \ > > else \ > > echo "dist-self-test: The bats package is not installed" ; \ > > Please merge this to the patch that is introducing this code instead of > piling a fixup on top. Similarly for other patching in this set.
Yes, as a tip on your local git tree you can do: git rebase -i <previous sha1 from patch that introduced the dnf list line> then you can pick the commit which adds test -x and squash it into the first commit: pick <sha1 from patch that introduced the dnf list line> squash <sha1 from patch that adds test -x> ... You can update the changelog with v2 and what changed, and then force push to the MR the new set. If you already aware of rebase -i ignore me, just trying to help. -- []'s Herton _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected]
