On Tue, Jun 19, 2018 at 01:00:48PM +0100, Daniel Stone wrote: > Unbreak 'dim setup' and 'dim status' by noting the new repo name, as > configured in rerere config. > > Signed-off-by: Daniel Stone <[email protected]> > Cc: Daniel Vetter <[email protected]>
Ugh. I restored the drm-upstream remote definition in nightly.conf until we have this sorted out. I also think we can nuke this all, I sent out a patch for to do that. Thanks a lot for reporting this, my apologies for the hiccup I caused :-/ -Daniel > --- > dim | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dim b/dim > index 1d562aa2360c..7092cd97b284 100755 > --- a/dim > +++ b/dim > @@ -1999,7 +1999,7 @@ function dim_status > > fetch_all > > - drm_remote=$(repo_to_remote drm-upstream) > + drm_remote=$(repo_to_remote drm) > > for branch in $dim_branches ; do > repo=$(branch_to_repo $branch) > @@ -2087,8 +2087,8 @@ function dim_setup > > setup_aux_checkout drm-tip $drm_tip_ssh drm-tip > cd drm-tip > - if git remote | grep -q drm-upstream ; then > - git config remote.drm-upstream.url $drm_upstream_git > + if git remote | grep -q '^drm$'; then > + git config remote.drm.url $drm_upstream_git > else > remote=$(url_to_remote $drm_tip_ssh) > remote=$(url_to_remote $drm_upstream_git) > -- > 2.17.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
