diff options
| author |  Andrew Waters <apwaters@googlemail.com> | 2010-10-22 13:26:02 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-22 11:51:10 -0700 |
| commit | 8b130262fb7b5d09df2af63f47d9bff1da220bfb (patch) | |
| tree | 02e050d83ae42dafda07cf01bc1bd272870ad4b4 | |
| parent | Git 1.7.1 (diff) | |
| download | tgif-8b130262fb7b5d09df2af63f47d9bff1da220bfb.tar.xz | |
Fix handling of git-p4 on deleted files
Signed-off-by: Andrew Waters <apwaters@googlemail.com>
Tested-by: Thomas Berg <merlin66b@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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: |