android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle Windows line endings when reading binary files

Browse Source 
Without this change, '.git\HEAD' files, for examples, are sometime
read incorrectly resulting in the current branch to be reset to
"master" when running a "repo init -b xxx" on an already initialized
repository.

Change-Id: I48c7ef85ff81626edf156914329a560e14252f2a
This commit is contained in:
Renaud Paquay 2016-11-01 13:48:15 -07:00
parent 9d743397bf
commit 2a4be94878
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git_refs.py
View File

@ -139,7 +139,7 @@ class GitRefs(object):
def _ReadLoose1(self, path, name):
try:
fd = open(path, 'rb')
fd = open(path)
except IOError:
return

6
project.py
View File

@ -1258,7 +1258,7 @@ class Project(object):
if is_new:
alt = os.path.join(self.gitdir, 'objects/info/alternates')
try:
fd = open(alt, 'rb')
fd = open(alt)
try:
alt_dir = fd.readline().rstrip()
finally:
@ -2691,11 +2691,11 @@ class Project(object):
else:
path = os.path.join(self._project.worktree, '.git', HEAD)
try:
fd = open(path, 'rb')
fd = open(path)
except IOError as e:
raise NoManifestException(path, str(e))
try:
line = fd.read()
line = fd.readline()
finally:
fd.close()
try: