~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add '--' to git-diff-index calls
[stgit]
/
stgit
/
git.py
diff --git
a/stgit/git.py
b/stgit/git.py
index
b7f3269
..
c8b7b8f
100644
(file)
--- a/
stgit/git.py
+++ b/
stgit/git.py
@@
-210,7
+210,7
@@
def __tree_status(files = None, tree_id = 'HEAD', unknown = False,
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', 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)
@@
-571,13
+571,13
@@
def diff(files = None, rev1 = 'HEAD', rev2 = None, out_fd = None):
files = []
if rev1 and rev2:
files = []
if rev1 and rev2:
- diff_str = _output(['git-diff-tree', '-p', rev1, rev2] + files)
+ diff_str = _output(['git-diff-tree', '-p', rev1, rev2
, '--'
] + files)
elif rev1 or rev2:
refresh_index()
if rev2:
elif rev1 or rev2:
refresh_index()
if rev2:
- diff_str = _output(['git-diff-index', '-p', '-R', rev2] + files)
+ diff_str = _output(['git-diff-index', '-p', '-R', rev2
, '--'
] + files)
else:
else:
- diff_str = _output(['git-diff-index', '-p', rev1] + files)
+ diff_str = _output(['git-diff-index', '-p', rev1
, '--'
] + files)
else:
diff_str = ''
else:
diff_str = ''