[PATCH] dim: Remove upgrade logic

Jani Nikula jani.nikula at linux.intel.com
Wed Sep 12 13:23:42 UTC 2018


On Tue, 11 Sep 2018, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> On Thu, Aug 30, 2018 at 3:39 PM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
>> Of course I forgot the imporant part.
>>
>> Note: Never push this, or anything after it, to the old place in
>> drm-tip/maintainer-tools.
>>
>> Given our track record of forgetting a critical part in migrations I
>> think it'd be good if we hold off for a week or so until we apply this
>> one though. It's just a few wasted cpu cycles when running dim
>> update-branches.
>>
>> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
>
> No one seems to have screamed too badly, I guess we can push this? Can
> I haz ack plz?

Provided you ensure this won't end up in the old repo, so people still
using that will migrate too,

Acked-by: Jani Nikula <jani.nikula at intel.com>


>
> Cheers, Daniel
>
>> ---
>>  dim | 8 --------
>>  1 file changed, 8 deletions(-)
>>
>> diff --git a/dim b/dim
>> index a645c70a2005..f5deae8dc4dd 100755
>> --- a/dim
>> +++ b/dim
>> @@ -2032,14 +2032,6 @@ function dim_update_branches
>>         fi
>>
>>         cd $DIM_PREFIX/maintainer-tools
>> -       if ! git remote | grep -q '^maintainer-tools$' ; then
>> -               git remote add maintainer-tools $maintainer_tools_https
>> -               git fetch maintainer-tools
>> -               git branch --set-upstream-to=maintainer-tools/master
>> -       else
>> -               echo "Maintainer tools already migrated."
>> -       fi
>> -
>>         if git_is_current_branch maintainer-tools ; then
>>                 echo "Updating maintainer-tools ..."
>>                 git pull --rebase
>> --
>> 2.18.0
>>

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the dim-tools mailing list