On Thu, Aug 08, 2019 at 11:15:05AM +0200, Sam Ravnborg wrote: > On Thu, Aug 08, 2019 at 10:31:55AM +0200, Daniel Vetter wrote: > > Ever since > > > > commit 0dee4cb65f405c8f3236e2bd70005f2f93571852 > > Author: Daniel Vetter <[email protected]> > > Date: Wed Nov 16 17:34:13 2016 +0100 > > > > dim: Make update_linux_next multi-repo compliant > > > > this shouldn't be a problem anymore, but I only commented one fo them > > out and must have forgotten about this all. > > > > Reported-by: Sam Ravnborg <[email protected]> > > Cc: Sam Ravnborg <[email protected]> > > Signed-off-by: Daniel Vetter <[email protected]> > Reviewed-by: Sam Ravnborg <[email protected]>
Pushed, thanks to you & Jani for taking a look. -Daniel > > > --- > > dim | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/dim b/dim > > index 7ecbaacfbf87..4e5179d32a88 100755 > > --- a/dim > > +++ b/dim > > @@ -536,14 +536,14 @@ function update_linux_next # branch next next-fixes > > fixes > > > > # always update drm-intel-fixes > > echo -n "Pushing $linux_fixes to for-linux-next-fixes... " > > - git_push $remote +$remote/$linux_fixes:for-linux-next-fixes # >& > > /dev/null > > + git_push $remote +$remote/$linux_fixes:for-linux-next-fixes > > echo "Done." > > > > if git merge-base --is-ancestor $remote/$linux_next_fixes > > $remote/$linux_fixes ; then > > # -fixes has caught up to dinf, i.e. we're out of the merge > > # window. Push the next queue. > > echo -n "Out of merge window. Pushing $linux_next to > > for-linux-next... " > > - git_push $remote +$remote/$linux_next:for-linux-next >& > > /dev/null > > + git_push $remote +$remote/$linux_next:for-linux-next > > echo "Done." > > else > > # dinf is ahead of -fixes, i.e. drm-next has already closed for > > @@ -551,7 +551,7 @@ function update_linux_next # branch next next-fixes > > fixes > > # for the current -next cycle. Push dinf > > > > echo -n "Pushing $linux_next_fixes to for-linux-next... " > > - git_push $remote +$remote/$linux_next_fixes:for-linux-next >& > > /dev/null > > + git_push $remote +$remote/$linux_next_fixes:for-linux-next > > echo "Done." > > fi > > } > > -- > > 2.22.0 > > > > _______________________________________________ > > dim-tools mailing list > > [email protected] > > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
