diff options
-rw-r--r-- | bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst index f715dee526..bd11719075 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | |||
@@ -424,8 +424,8 @@ This fetcher supports the following parameters: | |||
424 | 424 | ||
425 | - *"nobranch":* Tells the fetcher to not check the SHA validation for | 425 | - *"nobranch":* Tells the fetcher to not check the SHA validation for |
426 | the branch when set to "1". The default is "0". Set this option for | 426 | the branch when set to "1". The default is "0". Set this option for |
427 | the recipe that refers to the commit that is valid for a tag instead | 427 | the recipe that refers to the commit that is valid for a any namespace |
428 | of the branch. | 428 | instead of the branch. |
429 | 429 | ||
430 | - *"bareclone":* Tells the fetcher to clone a bare clone into the | 430 | - *"bareclone":* Tells the fetcher to clone a bare clone into the |
431 | destination directory without checking out a working tree. Only the | 431 | destination directory without checking out a working tree. Only the |
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 578edc5914..c80e8e5cf9 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
@@ -44,7 +44,7 @@ Supported SRC_URI options are: | |||
44 | 44 | ||
45 | - nobranch | 45 | - nobranch |
46 | Don't check the SHA validation for branch. set this option for the recipe | 46 | Don't check the SHA validation for branch. set this option for the recipe |
47 | referring to commit which is valid in tag instead of branch. | 47 | referring to commit which is valid in any namespace instead of branch. |
48 | The default is "0", set nobranch=1 if needed. | 48 | The default is "0", set nobranch=1 if needed. |
49 | 49 | ||
50 | - usehead | 50 | - usehead |
@@ -382,7 +382,11 @@ class Git(FetchMethod): | |||
382 | runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) | 382 | runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) |
383 | 383 | ||
384 | runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=ud.clonedir) | 384 | runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=ud.clonedir) |
385 | fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, shlex.quote(repourl)) | 385 | |
386 | if ud.nobranch: | ||
387 | fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, shlex.quote(repourl)) | ||
388 | else: | ||
389 | fetch_cmd = "LANG=C %s fetch -f --progress %s refs/heads/*:refs/heads/* refs/tags/*:refs/tags/*" % (ud.basecmd, shlex.quote(repourl)) | ||
386 | if ud.proto.lower() != 'file': | 390 | if ud.proto.lower() != 'file': |
387 | bb.fetch2.check_network_access(d, fetch_cmd, ud.url) | 391 | bb.fetch2.check_network_access(d, fetch_cmd, ud.url) |
388 | progresshandler = GitProgressHandler(d) | 392 | progresshandler = GitProgressHandler(d) |