summaryrefslogtreecommitdiff
path: root/git-fat
diff options
context:
space:
mode:
authorJed Brown <jed@59A2.org>2013-04-28 23:54:02 -0500
committerJed Brown <jed@59A2.org>2013-04-28 23:55:04 -0500
commit58db90461a596da50c3973da29c07ecc56aa5e24 (patch)
tree93af779ad3fae21faf4641e334fff046f9ef9b91 /git-fat
parentc82c298d67a0385cdc2723ba4453c33fe2819fc3 (diff)
parent4a5c6c9bb6d7cb08bee45e4303a6b18f76d5100b (diff)
downloadgit-fat-58db90461a596da50c3973da29c07ecc56aa5e24.tar.gz
Merge branch 'pull-with-unicode-filenames' of https://github.com/michaelcontento/git-fat (PR #12)
This does not resolve all unicode file name issues. We have at least these issues: 1. Filenames sometimes become command-line arguments, which we'd rather avoid because it forces us to decode/encode (on Windows). This can be fixed by systematically using '--stdin' options. 2. We still use 'git ls-files -s' in cmd_index_filter. It should also learn to use the -z option, but unfortunately, Python doesn't have convenient line processing for NUL-delimited streams so we have to write something like difftreez_reader to do that properly. * 'pull-with-unicode-filenames' of https://github.com/michaelcontento/git-fat: fix "git fat pull" for fancy named files [Normalized quoting style in merge.]
Diffstat (limited to 'git-fat')
-rwxr-xr-xgit-fat2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fat b/git-fat
index 7bceec1..5bc8156 100755
--- a/git-fat
+++ b/git-fat
@@ -265,7 +265,7 @@ class GitFat(object):
def orphan_files(self, patterns=[]):
'generator for all orphan placeholders in the working tree'
- for fname in subprocess.check_output(['git', 'ls-files'] + patterns).splitlines():
+ for fname in subprocess.check_output(['git', 'ls-files', '-z'] + patterns).split('\x00')[:-1]:
digest = self.decode_file(fname)[0]
if digest:
yield (digest, fname)