summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-09-27 16:41:39 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:46:15 +0100
commitdd71f67db1dad2e0bd89313fcc11126a6ce15b84 (patch)
tree149b5d6457e4da5109c7fd517d11d8c39f3348e4 /bitbake/lib/bb
parentb0403ff4cbcc6d472c69d44106dff551374076b6 (diff)
downloadpoky-dd71f67db1dad2e0bd89313fcc11126a6ce15b84.tar.gz
fetch2/git: Make git fetch run with -f so rebased branches don't fail
git fetches can fail (or at least return failed) when trying to fetch and prune rebased branches. This patch simply adds a -f to the git fetch command so these failure are ignore Generally, if some SHA was rebased away it's not coming back so there is no point in not doing this force (Bitbake rev: a7b75e4db52445b30ec0fc0053dcf454f5f7d2db) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-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 fb6125ce3f..87a35d97a3 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -190,7 +190,7 @@ class Git(FetchMethod):
190 logger.debug(1, "No Origin") 190 logger.debug(1, "No Origin")
191 191
192 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d) 192 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d)
193 fetch_cmd = "%s fetch --prune %s refs/*:refs/*" % (ud.basecmd, repourl) 193 fetch_cmd = "%s fetch -f --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
194 bb.fetch2.check_network_access(d, fetch_cmd, ud.url) 194 bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
195 runfetchcmd(fetch_cmd, d) 195 runfetchcmd(fetch_cmd, d)
196 runfetchcmd("%s prune-packed" % ud.basecmd, d) 196 runfetchcmd("%s prune-packed" % ud.basecmd, d)