From 0588f3dc527509d9de2fb1467a6d8eeb96292bc0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 8 Jan 2021 13:50:23 -0500 Subject: version: add remote tracking information This tells us what --repo-rev the user is using. Bug: https://crbug.com/1164415 Change-Id: Idb6c48e6ca5a4783c529717e6be38266bf7038b0 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/293143 Reviewed-by: Michael Mortensen Tested-by: Mike Frysinger --- subcmds/version.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'subcmds/version.py') diff --git a/subcmds/version.py b/subcmds/version.py index 000abf09..e95a86dc 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -33,12 +33,14 @@ class Version(Command, MirrorSafeCommand): def Execute(self, opt, args): rp = self.manifest.repoProject rem = rp.GetRemote(rp.remote.name) + branch = rp.GetBranch('default') # These might not be the same. Report them both. src_ver = RepoSourceVersion() rp_ver = rp.bare_git.describe(HEAD) print('repo version %s' % rp_ver) print(' (from %s)' % rem.url) + print(' (tracking %s)' % branch.merge) print(' (%s)' % rp.bare_git.log('-1', '--format=%cD', HEAD)) if self.wrapper_path is not None: -- cgit v1.2.3-54-g00ecf