From: "Mauro Queirós" <maurofrqueiros@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Mauro Queiros <maurofrqueiros@gmail.com>
Subject: [PATCH v2 3/3] git.py: Use the correct branch to check if the repository has LFS objects.
Date: Fri, 29 May 2020 11:01:59 +0100 [thread overview]
Message-ID: <20200529100159.32393-3-maurofrqueiros@gmail.com> (raw)
In-Reply-To: <20200529100159.32393-1-maurofrqueiros@gmail.com>
Function "contains_lfs" was only looking at the master branch when searching for LFS
content. LFS may be configured in specific branches only, so we need to use the
correct branch.
Signed-off-by: Mauro Queiros <maurofrqueiros@gmail.com>
---
lib/bb/fetch2/git.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index eab76a10..dbf87156 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -566,8 +566,15 @@ class Git(FetchMethod):
"""
Check if the repository has 'lfs' (large file) content
"""
- cmd = "%s grep lfs HEAD:.gitattributes | wc -l" % (
- ud.basecmd)
+
+ if not ud.nobranch:
+ branchname = ud.branches[ud.names[0]]
+ else:
+ branchname = "master"
+
+ cmd = "%s grep lfs origin/%s:.gitattributes | wc -l" % (
+ ud.basecmd, ud.branches[ud.names[0]])
+
try:
output = runfetchcmd(cmd, d, quiet=True, workdir=wd)
if int(output) > 0:
--
2.17.1
next prev parent reply other threads:[~2020-05-29 10:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 10:01 [PATCH v2 1/3] git.py: skip smudging if lfs=0 is set Mauro Queirós
2020-05-29 10:01 ` [PATCH v2 2/3] git.py: LFS bitbake note should not be printed if need_lfs is not set Mauro Queirós
2020-05-29 10:14 ` Mauro Queirós
2020-05-29 10:01 ` Mauro Queirós [this message]
2020-05-29 10:14 ` [PATCH v2 3/3] git.py: Use the correct branch to check if the repository has LFS objects Mauro Queirós
2020-05-29 10:14 ` [PATCH v2 1/3] git.py: skip smudging if lfs=0 is set Mauro Queirós
2020-05-29 10:32 ` ✗ patchtest: failure for "[v2] git.py: skip smudging if ..." and 2 more Patchwork
2020-05-29 10:06 [PATCH v2 1/3] git.py: skip smudging if lfs=0 is set Mauro Queirós
2020-05-29 10:06 ` [PATCH v2 3/3] git.py: Use the correct branch to check if the repository has LFS objects Mauro Queirós
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200529100159.32393-3-maurofrqueiros@gmail.com \
--to=maurofrqueiros@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.