Re: [PATCH] Fix handling of git-p4 on deleted files
- From
- Thomas Berg <merlin66b@gmail.com>
- Date
- Oct 22, 2010, 10:20 UTC
- Message-ID
- <AANLkTimHHbg1zVX+1L7Dwgj5VmMFdUZ5X_Vf6UK_26An@mail.gmail.com>
- In-Reply-To
- <AANLkTimzN9ZGwQZ-pi6SMWGY9KS0fjmXu=1gjdfck=W-@mail.gmail.com>
Hi,
On Mon, Oct 18, 2010 at 5:39 PM, Andrew Waters <apwaters@googlemail.com> wrote:
Show 5 quoted lines
> When you submit changes containing deleted file the command 'p4 diff > -du ...' includes diffs for deleted files. This causes the failure: > > open for read: <deleted file>: No such file or directory > Command failed: p4 diff -du ...
I'm a daily git-p4 user and noticed this problem too: 'git p4 submit' fails for commits with deleted files, with recent Perforce verions. The problem has been brought up earlier [1], but no patch has actually submitted yet.
Show 16 quoted lines
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index c1ea643..04ce7e3 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:
> --I just tested your patch, and it does indeed fix the problem. I think you need to "sign off" on the patch, other than that I support applying it.
Regards, Thomas
[1] http://kerneltrap.org/mailarchive/git/2010/5/28/31299