From: Karl Hasselström <kha@treskal.com>
Date: Tue, 3 Jun 2008 00:43:24 +0000 (+0200)
Subject: Merge branch 'stable' into stable-master-merge
X-Git-Tag: v0.15-rc1~217^2~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/9b4a6e70a1390d653201e48e12d09005b3fba6c8

Merge branch 'stable' into stable-master-merge
---

9b4a6e70a1390d653201e48e12d09005b3fba6c8
diff --cc stgit/git.py
index 570003c,8e6bdf4..0955be7
--- a/stgit/git.py
+++ b/stgit/git.py
@@@ -188,8 -190,20 +188,21 @@@ def ls_files(files, tree = 'HEAD', full
          # just hide the details of the 'git ls-files' command we use
          raise GitException, \
              'Some of the given paths are either missing or not known to GIT'
 +    return list(fileset)
  
+ def parse_git_ls(output):
+     t = None
+     for line in output.split('\0'):
+         if not line:
+             # There's a zero byte at the end of the output, which
+             # gives us an empty string as the last "line".
+             continue
+         if t == None:
+             mode_a, mode_b, sha1_a, sha1_b, t = line.split(' ')
+         else:
+             yield (t, line)
+             t = None
+ 
  def tree_status(files = None, tree_id = 'HEAD', unknown = False,
                    noexclude = True, verbose = False, diff_flags = []):
      """Get the status of all changed files, or of a selected set of