Clean-up: the "-r" option on git-diff-index has no effect, and is now
undocumented.
Signed-off-by: Chuck Lever <cel@netapp.com>
cache_files += [('C', filename) for filename in conflicts]
# the rest
cache_files += [('C', filename) for filename in conflicts]
# the rest
- for line in _output_lines(['git-diff-index', '-r', tree_id] + files):
+ for line in _output_lines(['git-diff-index', tree_id] + files):
fs = tuple(line.rstrip().split(' ',4)[-1].split('\t',1))
if fs[1] not in conflicts:
cache_files.append(fs)
fs = tuple(line.rstrip().split(' ',4)[-1].split('\t',1))
if fs[1] not in conflicts:
cache_files.append(fs)