summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-08 11:07:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-08 13:46:13 (GMT)
commit04eaedb804fc9f19361dc66b02ae73fc331c4f86 (patch)
tree86747f0ab612babd3c0e1fa4dffea319e1c9d90b
parent3315b9f4a55c7f9ded954fe990174e9382827739 (diff)
downloadpoky-04eaedb804fc9f19361dc66b02ae73fc331c4f86.tar.gz
bitbake: fetch2: Change git fetcher not to destroy old references
It looks like we're about to see a lot of changes in branch names in repos. If we have the prune option here, those old names are lost, the changes propagate to our source mirrors and our old releases break. We have the force option so any replaced references should be replaced, its only orphaned branches which will now be preserved. I believe this behaviour will cause us fewer problems given the changes that look likely to happen. (Bitbake rev: 12d8cc3fecd550c4aadf0519e80711d755ee75ba) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 59a2ee8..b5d6f99 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -363,7 +363,7 @@ class Git(FetchMethod):
363 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) 363 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
364 364
365 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir) 365 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir)
366 fetch_cmd = "LANG=C %s fetch -f --prune --progress %s refs/*:refs/*" % (ud.basecmd, repourl) 366 fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, repourl)
367 if ud.proto.lower() != 'file': 367 if ud.proto.lower() != 'file':
368 bb.fetch2.check_network_access(d, fetch_cmd, ud.url) 368 bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
369 progresshandler = GitProgressHandler(d) 369 progresshandler = GitProgressHandler(d)