diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 12:46:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 12:46:14 -0800 |
| commit | 385cc9d8c44eb5be9d57e630129752a72c0a08c8 (patch) | |
| tree | 7f88fcd6c73d8391eae97f1f01e6c63e2abcb6a3 /contrib | |
| parent | 6cf9bf6cbcfd57606da30710656b248651d3113f (diff) | |
| parent | 8b130262fb7b5d09df2af63f47d9bff1da220bfb (diff) | |
| download | git-385cc9d8c44eb5be9d57e630129752a72c0a08c8.tar.gz | |
Merge branch 'aw/git-p4-deletion' into maint
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index c1ea643ace..04ce7e3b02 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -706,7 +706,9 @@ class P4Submit(Command): submitTemplate = self.prepareLogMessage(template, logMessage) if os.environ.has_key("P4DIFF"): del(os.environ["P4DIFF"]) - diff = p4_read_pipe("diff -du ...") + diff = "" + for editedFile in editedFiles: + diff += p4_read_pipe("diff -du %r" % editedFile) newdiff = "" for newFile in filesToAdd: |