On Thu, Jun 23, 2016 at 12:26:03PM +0200, Martin Jansa wrote: > Can you please use different branch name for this? > > There was marquiz/build-perf branch just few days ago: > > OE @ ~/openembedded-core $ git log --pretty=fuller > contrib/marquiz/build-perf > commit 51bd580b2b44636007e698832f585bbd5785ca02 > Author: Markus Lehtonen <markus.lehto...@linux.intel.com> > AuthorDate: Fri May 27 16:53:08 2016 +0300 > Commit: Markus Lehtonen <markus.lehto...@linux.intel.com> > CommitDate: Thu Jun 16 15:31:15 2016 +0300 > > oe-build-perf-test: print summary of test statuses > > Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com> > > And now everybody would need to run git remote prune, to remove this > branch in order to fetch new marquiz/build-perf/python-rewrite (where > marquiz/build-perf will serve as a directory - so there cannot be a > branch with the same name here) > > > Processing openembedded-core: From > git://git.openembedded.org/openembedded-core-contrib > * [new branch] ChenQi/PU-20160623 -> origin/ChenQi/PU-20160623 > error: 'refs/remotes/origin/marquiz/build-perf' exists; cannot create > 'refs/remotes/origin/marquiz/build-perf/python-rewrite' > ! [new branch] marquiz/build-perf/python-rewrite -> > origin/marquiz/build-perf/python-rewrite (unable to update local ref) > error: some local refs could not be updated; try running > 'git remote prune origin' to remove any old, conflicting branches >
Another one was added tonight: Fetching contrib remote: Counting objects: 264, done. remote: Compressing objects: 100% (94/94), done. remote: Total 264 (delta 188), reused 235 (delta 169) Receiving objects: 100% (264/264), 37.85 KiB | 0 bytes/s, done. Resolving deltas: 100% (188/188), completed with 27 local objects. error: cannot lock ref 'refs/remotes/contrib/marquiz/build-perf/new-format': 'refs/remotes/contrib/marquiz/build-perf' exists; cannot create 'refs/remotes/contrib/marquiz/build-perf/new-format' From git+ssh://git.openembedded.org/openembedded-core-contrib ! [new branch] marquiz/build-perf/new-format -> contrib/marquiz/build-perf/new-format (unable to update local ref) error: cannot lock ref 'refs/remotes/contrib/marquiz/build-perf/python-rewrite': 'refs/remotes/contrib/marquiz/build-perf' exists; cannot create 'refs/remotes/contrib/marquiz/build-perf/python-rewrite' ! [new branch] marquiz/build-perf/python-rewrite -> contrib/marquiz/build-perf/python-rewrite (unable to update local ref) + 411e291...ecbd05f paule/startup-oe -> contrib/paule/startup-oe (forced update) error: some local refs could not be updated; try running 'git remote prune contrib' to remove any old, conflicting branches error: Could not fetch contrib I've renamed both to have dash instead of slash after build-perf: * [new branch] marquiz/build-perf-new-format -> marquiz/build-perf-new-format * [new branch] marquiz/build-perf-python-rewrite -> marquiz/build-perf-python-rewrite because I'm tired of seeing all my jenkins job reporting failure from this fetch and I don't want to go to every single jenkins workspace to call git remote prune just because of this (or to extend the git updating tooling to also call git remote prune before any fetch). Regards, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
