From 61ab7fcef93690ec10fe31ea50a5e00899c796ea Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 27 Nov 2017 11:00:29 +0100
Subject: [PATCH] dim: fetch all repos in dim status
To make sure the report is actually accurate. Motivated in a
discussion with Joonas.
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
dim | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/dim b/dim
index ee958be..ce0c7fa 100755
--- a/dim
+++ b/dim
@@ -651,6 +651,16 @@ function commit_rerere_cache
git push $DRY_RUN $remote HEAD >& /dev/null && echo "Done."
}
+function fetch_all
+{
+ for repo in "${!drm_tip_repos[@]}"; do
+ remote=$(repo_to_remote $repo)
+ echo -n "Fetching $repo (local remote $remote)... "
+ git_fetch_helper $remote
+ echo "Done."
+ done
+}
+
function dim_rebuild_tip
{
local integration_branch specfile first rerere repo remote
@@ -682,12 +692,7 @@ function dim_rebuild_tip
# that they look the same for everyone
git config merge.conflictstyle merge
- for repo in "${!drm_tip_repos[@]}"; do
- remote=$(repo_to_remote $repo)
- echo -n "Fetching $repo (local remote $remote)... "
- git_fetch_helper $remote
- echo "Done."
- done
+ fetch_all
# merge -fixes
for conf in "${drm_tip_config[@]}"; do
@@ -1834,6 +1839,8 @@ function dim_status
cd $DIM_PREFIX/$DIM_REPO
+ fetch_all
+
drm_remote=$(repo_to_remote drm-upstream)
for branch in $dim_branches ; do
--
GitLab