[PATCH 2/6] dim: use drm_tip_repos for drm-tip repo URL
Jani Nikula
jani.nikula at intel.com
Fri Oct 6 14:58:22 UTC 2017
Since drm_tip_repos now contains drm-tip, we can use it to reduce
dependency on URLs hard-coded in dim.
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
dim | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dim b/dim
index 3846efc0aefc..26188142c82c 100755
--- a/dim
+++ b/dim
@@ -491,7 +491,7 @@ function dim_retip
branch=$(git symbolic-ref --short HEAD)
fi
- remote=$(url_to_remote $drm_tip_ssh)
+ remote=$(repo_to_remote drm-tip)
upstream=$(git_find_tip "$branch")
if [[ -z "$upstream" ]]; then
@@ -723,7 +723,7 @@ function dim_rebuild_tip
git commit --quiet -m "$integration_branch: $time integration manifest"
echo "Done."
- remote=$(url_to_remote $drm_tip_ssh)
+ remote=$(repo_to_remote drm-tip)
echo -n "Pushing $integration_branch... "
git push $DRY_RUN $remote +HEAD >& /dev/null && echo "Done."
@@ -928,7 +928,7 @@ function dim_backmerge
upstream=${2:?$usage}
cd $DIM_PREFIX/drm-tip
- tip_remote=$(url_to_remote $drm_tip_ssh)
+ tip_remote=$(repo_to_remote drm-tip)
git fetch -q $tip_remote || true
if ! git merge-base --is-ancestor $upstream $tip_remote/drm-tip ; then
@@ -1039,7 +1039,7 @@ function commit_list_references
local commit remote log
cd $DIM_PREFIX/drm-tip
- remote=$(url_to_remote $drm_tip_ssh)
+ remote=$(repo_to_remote drm-tip)
git fetch -q $remote || true
commit="$1"
@@ -1560,7 +1560,7 @@ function dim_update_next
assert_branch drm-intel-next-queued
- remote=$(url_to_remote $drm_tip_ssh)
+ remote=$(repo_to_remote drm-tip)
git pull --ff-only
git fetch drm-tip
@@ -1596,7 +1596,7 @@ function dim_update_next_continue
assert_branch drm-intel-next-queued
intel_remote=$(repo_to_remote drm-intel)
- remote=$(url_to_remote $drm_tip_ssh)
+ remote=$(repo_to_remote drm-tip)
git push $DRY_RUN -f $intel_remote drm-intel-next-queued:drm-intel-next
tag=drm-intel-next-$today
--
2.11.0
More information about the dim-tools
mailing list