summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-02-29 02:52:44 -0500
committerDavid Pursehouse <dpursehouse@collab.net>2020-03-17 05:38:19 +0000
commit23c900f105dd88bb404cfada0377fa817881cff8 (patch)
tree837488a4bf3c983607bac71ddb8eb3f8ed6c8d22
parentbb930461cee056de210816e58c36a8d6dfd122be (diff)
downloadgit-repo-23c900f105dd88bb404cfada0377fa817881cff8.tar.gz
sync: warn if not tracking a branch
Since tracking a branch prevents repo from updating, make sure we warn people about the situation when using `repo sync`. Bug: https://crbug.com/gerrit/11045 Change-Id: I966513f510827cc93194f8df176c6745946bd739 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/258892 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: David Pursehouse <dpursehouse@collab.net>
-rw-r--r--subcmds/sync.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index ae29f085..dadf2e45 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -845,6 +845,13 @@ later is required to fix a server side protocol bug.
845 845
846 rp = self.manifest.repoProject 846 rp = self.manifest.repoProject
847 rp.PreSync() 847 rp.PreSync()
848 cb = rp.CurrentBranch
849 if cb:
850 base = rp.GetBranch(cb).merge
851 if not base or not base.startswith('refs/heads/'):
852 print('warning: repo is not tracking a remote branch, so it will not '
853 'receive updates; run `repo init --repo-branch=stable` to fix.',
854 file=sys.stderr)
848 855
849 mp = self.manifest.manifestProject 856 mp = self.manifest.manifestProject
850 mp.PreSync() 857 mp.PreSync()