[PATCH 5/6] dim: support master branch usage for maintainer-tools update
Jani Nikula
jani.nikula at intel.com
Fri Jan 11 15:06:02 UTC 2019
The default repository is master nowadays.
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
dim | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dim b/dim
index d083f5558b5e..09eb801b2704 100755
--- a/dim
+++ b/dim
@@ -2046,8 +2046,8 @@ function dim_update_branches
done
cd $DIM_PREFIX/maintainer-tools
- if git_is_current_branch maintainer-tools ; then
- echo "Updating maintainer-tools ..."
+ if git_is_current_branch master || git_is_current_branch maintainer-tools; then
+ echo "Updating maintainer-tools..."
git pull --rebase
fi
--
2.20.1
More information about the dim-tools
mailing list