Skip to content

Commit fb33ab6

Browse files
committed
Remove default checkout version
Signed-off-by: jiyeong.seok <[email protected]>
1 parent afc25ad commit fb33ab6

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/fosslight_util/download.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,17 +212,16 @@ def download_git_repository(refs_to_checkout, git_url, target_dir, tag):
212212
if refs_to_checkout:
213213
try:
214214
# gitPython uses the branch argument the same whether you check out to a branch or a tag.
215-
repo = Repo.clone_from(git_url, target_dir, branch=refs_to_checkout)
215+
Repo.clone_from(git_url, target_dir, branch=refs_to_checkout)
216216
success = True
217217
oss_version = refs_to_checkout
218218
except GitCommandError as error:
219219
logger.debug(f"Git checkout error:{error}")
220220
success = False
221221

222222
if not success:
223-
repo = Repo.clone_from(git_url, target_dir)
223+
Repo.clone_from(git_url, target_dir)
224224
success = True
225-
oss_version = repo.active_branch.name
226225
return success, oss_version
227226

228227

tests/test_download.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def test_download_main_branch_when_any_branch_or_tag_not_entered():
9494
# given
9595
git_url = "https://github.com/LGE-OSS/example"
9696
target_dir = os.path.join(constants.TEST_RESULT_DIR, "download/example")
97-
expected_oss_name = "main"
97+
expected_oss_ver = ""
9898

9999
# when
100100
success, _, oss_name, oss_version = download_git_clone(git_url, target_dir)
@@ -103,15 +103,15 @@ def test_download_main_branch_when_any_branch_or_tag_not_entered():
103103
assert success is True
104104
assert len(os.listdir(target_dir)) > 0
105105
assert oss_name == 'LGE-OSS-example'
106-
assert oss_version == expected_oss_name
106+
assert oss_version == expected_oss_ver
107107

108108

109109
def test_download_main_branch_when_non_existent_branch_entered():
110110
# given
111111
git_url = "https://github.com/LGE-OSS/example"
112112
target_dir = os.path.join(constants.TEST_RESULT_DIR, "download/example")
113113
branch_name = "non-existent-branch"
114-
expected_oss_name = "main"
114+
expected_oss_ver = ""
115115

116116
# when
117117
success, _, oss_name, oss_version = download_git_clone(git_url, target_dir, "", "", branch_name)
@@ -120,15 +120,15 @@ def test_download_main_branch_when_non_existent_branch_entered():
120120
assert success is True
121121
assert len(os.listdir(target_dir)) > 0
122122
assert oss_name == 'LGE-OSS-example'
123-
assert oss_version == expected_oss_name
123+
assert oss_version == expected_oss_ver
124124

125125

126126
def test_download_main_branch_when_non_existent_tag_entered():
127127
# given
128128
git_url = "https://github.com/LGE-OSS/example"
129129
target_dir = os.path.join(constants.TEST_RESULT_DIR, "download/example")
130130
tag_name = "non-existent-tag"
131-
expected_oss_name = "main"
131+
expected_oss_ver = ""
132132

133133
# when
134134
success, _, oss_name, oss_version = download_git_clone(git_url, target_dir, "", tag_name)
@@ -137,4 +137,4 @@ def test_download_main_branch_when_non_existent_tag_entered():
137137
assert success is True
138138
assert len(os.listdir(target_dir)) > 0
139139
assert oss_name == 'LGE-OSS-example'
140-
assert oss_version == expected_oss_name
140+
assert oss_version == expected_oss_ver

0 commit comments

Comments
 (0)