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:02 (GMT)
commit53f6c01fae28d6c8451d68a26145f896129ed172 (patch)
tree2d4b75daef191fc091b3b9cb2ac431293854f454
parent5408e48d374fc741fa46b57ddfd8a537843bda6f (diff)
downloadpoky-53f6c01fae28d6c8451d68a26145f896129ed172.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: e2fc4147bbe436ac79de187d92d3bc80a8a95349) 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 9ba9cdc..82d7325 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -355,7 +355,7 @@ class Git(FetchMethod):
355 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) 355 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
356 356
357 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir) 357 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir)
358 fetch_cmd = "LANG=C %s fetch -f --prune --progress %s refs/*:refs/*" % (ud.basecmd, repourl) 358 fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, repourl)
359 if ud.proto.lower() != 'file': 359 if ud.proto.lower() != 'file':
360 bb.fetch2.check_network_access(d, fetch_cmd, ud.url) 360 bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
361 progresshandler = GitProgressHandler(d) 361 progresshandler = GitProgressHandler(d)