[PATCH 2/6] dim: simplify rebuild-tip output

Jani Nikula jani.nikula at intel.com
Fri Jan 11 15:05:59 UTC 2019


If the dim repo name matches the git remote, only print the repo name.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 dim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index 36fe3c41c555..e502511f5063 100755
--- a/dim
+++ b/dim
@@ -724,7 +724,11 @@ function dim_rebuild_tip
 		remote=$(repo_to_remote $repo)
 		sha1=$remote/$branch
 
-		echo -n "Merging $repo (local remote $remote) $branch... "
+		if [[ "$repo" = "$remote" ]]; then
+			echo -n "Merging $repo/$branch... "
+		else
+			echo -n "Merging $repo/$branch (local remote $remote)... "
+		fi
 
 		if [[ -n "$override" ]]; then
 			sha1=$override
-- 
2.20.1



More information about the dim-tools mailing list