diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-06-19 14:06:14 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-06-20 18:00:55 +0200 |
| commit | 14563dc3bfcd8f1888149eb45be3a337bec3d542 (patch) | |
| tree | 91ce6b08506379e1f38f613b16ed3fea2b993217 | |
| parent | fe7d9c12aa9da84e070dc8b97b35c1d697f55419 (diff) | |
dim: remove all mentions of drm-upstream
The one case in dim_status is entirely unused.
The usage in dim_setup seems still in use, but this is code for
backwards compat hacks predating the original creating of the
maintainer-tools branch - i.e. no maintainer or committer except me
ever needed this.
There's also no need to make sure drm-tip has all the right remotes
nowadays, because that's all encoded in nightly.conf, and will be
checked (if the remotes are missing) in dim_rebuild_tip.
Reported-by: Daniel Stone <daniels@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rwxr-xr-x | dim | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -1992,15 +1992,13 @@ function dim_update_branches function dim_status { - local repo remote drm_remote patches + local repo remote patches local drm_next_upstream drm_fixes_upstream cd $DIM_PREFIX/$DIM_REPO fetch_all - drm_remote=$(repo_to_remote drm-upstream) - for branch in $dim_branches ; do repo=$(branch_to_repo $branch) remote=$(repo_to_remote $repo) @@ -2055,10 +2053,9 @@ function setup_aux_checkout # name url directory function dim_setup { - local remote drm_tip_ssh drm_upstream_git linux_upstream_git + local remote drm_tip_ssh linux_upstream_git drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip - drm_upstream_git=git://people.freedesktop.org/~airlied/linux linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git if [ ! -d $DIM_PREFIX ]; then @@ -2086,13 +2083,6 @@ function dim_setup setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere 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 - else - remote=$(url_to_remote $drm_tip_ssh) - remote=$(url_to_remote $drm_upstream_git) - fi echo "dim setup successfully completed!" } |