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:09 (GMT)
commitb65fc3d950adb80f605c6359614afded9a2f6185 (patch)
tree3392f19622759fa7186d7db54508964350d737e1
parent5ea39eac95e00a97289eb93e7d2863a3e1de5770 (diff)
downloadpoky-b65fc3d950adb80f605c6359614afded9a2f6185.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: 4c7e0352c56dc956fc19439713e8dce9f6248c86) 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 80caf10..7adf2c4 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -353,7 +353,7 @@ class Git(FetchMethod):
353 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) 353 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
354 354
355 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir) 355 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir)
356 fetch_cmd = "LANG=C %s fetch -f --prune --progress %s refs/*:refs/*" % (ud.basecmd, repourl) 356 fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, repourl)
357 if ud.proto.lower() != 'file': 357 if ud.proto.lower() != 'file':
358 bb.fetch2.check_network_access(d, fetch_cmd, ud.url) 358 bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
359 progresshandler = GitProgressHandler(d) 359 progresshandler = GitProgressHandler(d)