[bitbake-devel] [PATCH] Make git fetch run with -f so rebased branches don't fail
Matthew McClintock
msm at freescale.com
Tue Sep 27 21:41:39 UTC 2011
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
Signed-off-by: Matthew McClintock <msm at freescale.com>
---
This seems to fix the issue when building against our internal trees
which are constantly rebased wrt to git fetch throwing errors if a
non fast-forward-able branch is found
lib/bb/fetch2/git.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index fb6125c..87a35d9 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -190,7 +190,7 @@ class Git(FetchMethod):
logger.debug(1, "No Origin")
runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d)
- fetch_cmd = "%s fetch --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
+ fetch_cmd = "%s fetch -f --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
runfetchcmd(fetch_cmd, d)
runfetchcmd("%s prune-packed" % ud.basecmd, d)
--
1.7.6.1
More information about the bitbake-devel
mailing list