Permalink
Browse files

Diff without renames.

When the configuration has `diff.renames=true` the --name-status diff can
contain renames, that the following code can not handle.

Since we can't deal with renames on FTP level, we should explicitly use
--no-renames.
  • Loading branch information...
1 parent 40636f1 commit bde96220e8c21c79bd13e615d4cb984c33add91b @niklasf niklasf committed Apr 25, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 git-ftp.py
View
@@ -252,7 +252,7 @@ def upload_diff(repo, oldtree, tree, ftp, base):
have a trailing slash.
"""
- diff = repo.git.diff("--name-status", oldtree.hexsha, tree.hexsha).split("\n")
+ diff = repo.git.diff("--name-status", "--no-renames", oldtree.hexsha, tree.hexsha).split("\n")
for line in diff:
if not line: continue
status, file = line.split("\t", 1)

0 comments on commit bde9622

Please sign in to comment.