[PATCH] dim: Change drm-upstream remote to drm
Daniel Stone
daniels at collabora.com
Tue Jun 19 12:00:48 UTC 2018
Unbreak 'dim setup' and 'dim status' by noting the new repo name, as
configured in rerere config.
Signed-off-by: Daniel Stone <daniels at collabora.com>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
---
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
More information about the dim-tools
mailing list