Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-05-07 Thread Junio C Hamano
Tolga Ceylan writes: > When applying binary patches a full index is required. format-patch > already handles this, but diff-tree needs '--full-index' argument > to always output full index. When git-p4 runs git-apply to test > the patch, git-apply rejects the patch due to abbreviated blob > objec

[PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-05-06 Thread Tolga Ceylan
When applying binary patches a full index is required. format-patch already handles this, but diff-tree needs '--full-index' argument to always output full index. When git-p4 runs git-apply to test the patch, git-apply rejects the patch due to abbreviated blob object names. This is the error messag

Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-05-05 Thread Pete Wyckoff
tolga.cey...@gmail.com wrote on Fri, 02 May 2014 22:40 -0700: > > > > >This is the error message git-apply emits in this case: > > > >error: cannot apply binary patch to '' without full index line > >error: : patch does not apply > > > >Cheers, > >Tolga > > Any feedback is appreciated. Sorry, tr

Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-05-02 Thread tolga ceylan
This is the error message git-apply emits in this case: error: cannot apply binary patch to '' without full index line error: : patch does not apply Cheers, Tolga Any feedback is appreciated. Cheers, Tolga -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a me

Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-04-26 Thread tolga ceylan
On 04/26/2014 02:12 PM, tolga ceylan wrote: Yes, when git-p4 runs git-apply to test the patch, this fails due to abbreviated blob object names. I think git-apply requires full object names for binary patches. This looks like a straightforward change, but can you give a bit more background on

Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-04-26 Thread tolga ceylan
Yes, when git-p4 runs git-apply to test the patch, this fails due to abbreviated blob object names. I think git-apply requires full object names for binary patches. On 04/26/2014 05:43 AM, Pete Wyckoff wrote: tolga.cey...@gmail.com wrote on Thu, 24 Apr 2014 21:46 -0700: When applying binary pat

Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-04-26 Thread Pete Wyckoff
tolga.cey...@gmail.com wrote on Thu, 24 Apr 2014 21:46 -0700: > When applying binary patches a full index is required. format-patch > already handles this, but diff-tree needs '--full-index' argument > to always output full index. > > Signed-off-by: Tolga Ceylan > --- > git-p4.py |2 +- > 1

[PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-04-24 Thread Tolga Ceylan
When applying binary patches a full index is required. format-patch already handles this, but diff-tree needs '--full-index' argument to always output full index. Signed-off-by: Tolga Ceylan --- git-p4.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.p