From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 5 Feb 2011 13:16:45 +0000 (+0100)
Subject: bitbake/fetch2/git: Ensure we prune origin to remove stale branches
X-Git-Tag: 2011-1~2509
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=96810cade04cad44d70a7c6e51aacdf89caef92b;p=openembedded-core.git

bitbake/fetch2/git: Ensure we prune origin to remove stale branches

Thanks to Bruce Ashfield for the tip.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 9f79d47762..ec20d262a8 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -127,6 +127,7 @@ class Git(Fetch):
                 needupdate = True
         if needupdate:
             bb.fetch2.check_network_access(d, "git fetch %s%s" % (ud.host, ud.path))
+            runfetchcmd("%s remote prune origin" % ud.basecmd, d)
             runfetchcmd("%s remote rm origin" % ud.basecmd, d)
             runfetchcmd("%s remote add origin %s://%s%s%s" % (ud.basecmd, ud.proto, username, ud.host, ud.path), d)
             runfetchcmd("%s fetch --all -t" % ud.basecmd, d)