Skip to content

Commit 4cede23

Browse files
committed
Win, #519: Ensure fixtures & bashscript checked-out eol=lf
+ FIX all Diff TCs.
1 parent e61439b commit 4cede23

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

Diff for: .appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ install:
3535
#
3636
- |
3737
uname -a
38-
where git git-daemon python pip
38+
where git git-daemon python pip pip3 pip34
3939
python --version
4040
python -c "import struct; print(struct.calcsize('P') * 8)"
4141

Diff for: .gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
git/test/fixtures/* eol=lf
2+
init-tests-after-clone.sh

Diff for: git/compat.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ class UnicodeMixin(object):
8888
"""Mixin class to handle defining the proper __str__/__unicode__
8989
methods in Python 2 or 3."""
9090

91-
if sys.version_info[0] >= 3: # Python 3
91+
if PY3:
9292
def __str__(self):
9393
return self.__unicode__()
9494
else: # Python 2
9595
def __str__(self):
96-
return self.__unicode__().encode('utf8')
96+
return self.__unicode__().encode(defenc)

Diff for: git/index/fun.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def run_commit_hook(name, index):
7676
stdout=subprocess.PIPE,
7777
stderr=subprocess.PIPE,
7878
cwd=index.repo.working_dir,
79-
close_fds=(is_posix),
79+
close_fds=is_posix,
8080
creationflags=PROC_CREATIONFLAGS,)
8181
stdout, stderr = cmd.communicate()
8282
cmd.stdout.close()

0 commit comments

Comments
 (0)