@@ -143,36 +143,13 @@ def git_fetch(info, source_location, name):
143
143
return info
144
144
145
145
146
- def gix_hack (path : str ):
147
- # FIXME: reset HEAD to the first valid branch to fix gix can't second fetch src issue.
148
- subprocess .check_call (
149
- ['git' , 'symbolic-ref' , 'HEAD' , 'refs/heads/HEAD' ], cwd = path )
150
- valid_branches = subprocess .check_output (
151
- ['git' , 'branch' ], cwd = path , encoding = 'utf-8' ).splitlines ()
152
- invalid : bool = True
153
- for word in valid_branches :
154
- word = word .strip ()
155
- if len (word ) > 0 :
156
- branch : str = word
157
- invalid = False
158
- break
159
- if invalid :
160
- logging .warn (
161
- 'No valid branches found. Falling back to traditional git.' )
162
- raise ValueError ('No valid branches found' )
163
- subprocess .check_call (
164
- ['git' , 'symbolic-ref' , 'HEAD' , 'refs/heads/' + branch ], cwd = path )
165
- os .remove (os .path .join (path , "index" ))
166
-
167
-
168
146
def gix_fetch (info : ACBSSourceInfo , source_location : str , name : str ) -> Optional [ACBSSourceInfo ]:
169
147
full_path = os .path .join (source_location , name )
170
148
if not os .path .exists (full_path ):
171
149
subprocess .check_call (['gix' , 'clone' , '--bare' , info .url , full_path ])
172
150
else :
173
151
logging .info ('Updating repository with gix...' )
174
152
# gix doesn't have the --prune option yet.
175
- gix_hack (full_path )
176
153
subprocess .check_call (
177
154
['gix' , 'fetch' , 'origin' , '+refs/heads/*:refs/heads/*' ], cwd = full_path )
178
155
info .source_location = full_path
0 commit comments