From: Jermain Horsman <[email protected]>
Previously _is_repo_git_repo() would return a result containing b'true\n' or
b'false\n' if 'git rev-parse' ran successfully, instead of True of False.
While this can be solved using e.g. result.strip().decode("utf-8") == "true",
there are some other cases to consider.
First, .git can be a file and not a directory when using a worktree.
Second, an emtpy .git directory in 'repodir' for which some parent of
'repodir' is an actual git repo will still return True in this case.
To account for these cases as well, use 'git rev-parse --show-toplevel'
and compare the result against 'repodir' instead of
using 'git rev-parse --is-inside-git-dir'.
Signed-off-by: Jermain Horsman <[email protected]>
---
scripts/oe-setup-layers | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers
index c8012fa670..6d49688a32 100755
--- a/scripts/oe-setup-layers
+++ b/scripts/oe-setup-layers
@@ -20,13 +20,13 @@ import os
import subprocess
def _is_repo_git_repo(repodir):
- git_dir = os.path.join(repodir, ".git")
- if not os.access(git_dir, os.R_OK):
- return False
try:
- return subprocess.check_output("git -C %s rev-parse
--is-inside-git-dir" % git_dir, shell=True, stderr=subprocess.DEVNULL)
+ curr_toplevel = subprocess.check_output("git -C %s rev-parse
--show-toplevel" % repodir, shell=True, stderr=subprocess.DEVNULL)
+ if curr_toplevel.strip().decode("utf-8") == repodir:
+ return True
except subprocess.CalledProcessError:
- return False
+ pass
+ return False
def _is_repo_at_rev(repodir, rev):
try:
--
2.42.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188642):
https://lists.openembedded.org/g/openembedded-core/message/188642
Mute This Topic: https://lists.openembedded.org/mt/101735474/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
