File tree Expand file tree Collapse file tree
Open diff view settings
Expand file tree Collapse file tree
Open diff view settings
Original file line number Diff line number Diff line change @@ -463,8 +463,8 @@ def unmerged_blobs(self):
463463 for stage , blob in self .iter_blobs (is_unmerged_blob ):
464464 path_map .setdefault (blob .path , []).append ((stage , blob ))
465465 # END for each unmerged blob
466- for l in path_map .values ():
467- l .sort ()
466+ for line in path_map .values ():
467+ line .sort ()
468468 return path_map
469469
470470 @classmethod
Original file line number Diff line number Diff line change @@ -466,7 +466,7 @@ def delete(cls, repo, path):
466466 # write-binary is required, otherwise windows will
467467 # open the file in text mode and change LF to CRLF !
468468 with open (pack_file_path , 'wb' ) as fd :
469- fd .writelines (l .encode (defenc ) for l in new_lines )
469+ fd .writelines (line .encode (defenc ) for line in new_lines )
470470
471471 except (OSError , IOError ):
472472 pass # it didn't exist at all
Original file line number Diff line number Diff line change @@ -686,7 +686,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):
686686
687687 # read head information
688688 with open (osp .join (self .repo .common_dir , 'FETCH_HEAD' ), 'rb' ) as fp :
689- fetch_head_info = [l .decode (defenc ) for l in fp .readlines ()]
689+ fetch_head_info = [line .decode (defenc ) for line in fp .readlines ()]
690690
691691 l_fil = len (fetch_info_lines )
692692 l_fhi = len (fetch_head_info )
Original file line number Diff line number Diff line change @@ -212,7 +212,7 @@ def test_index_file_from_tree(self, rw_repo):
212212 assert unmerged_blob_map
213213
214214 # pick the first blob at the first stage we find and use it as resolved version
215- three_way_index .resolve_blobs (l [0 ][1 ] for l in unmerged_blob_map .values ())
215+ three_way_index .resolve_blobs (line [0 ][1 ] for line in unmerged_blob_map .values ())
216216 tree = three_way_index .write_tree ()
217217 assert isinstance (tree , Tree )
218218 num_blobs = 0
You can’t perform that action at this time.
0 commit comments