[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 message git-apply emits in this
case:

error: cannot apply binary patch to '' without full index line
error: : patch does not apply

Signed-off-by: Tolga Ceylan 
Acked-by: Pete Wyckoff 
---
 git-p4.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-p4.py b/git-p4.py
index cdfa2df..4ee6739 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap):
 else:
 die("unknown modifier %s for %s" % (modifier, path))
 
-diffcmd = "git diff-tree -p \"%s\"" % (id)
+diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
 patchcmd = diffcmd + " | git apply "
 tryPatchCmd = patchcmd + "--check -"
 applyPatchCmd = patchcmd + "--check --apply -"
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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 message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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 why a full index is required?  Do you
mean that "git apply" will reject a patch with abbreviated
blob object names?

-- Pete



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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 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.py
index cdfa2df..4ee6739 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap):
  else:
  die("unknown modifier %s for %s" % (modifier, path))

-diffcmd = "git diff-tree -p \"%s\"" % (id)
+diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
  patchcmd = diffcmd + " | git apply "
  tryPatchCmd = patchcmd + "--check -"
  applyPatchCmd = patchcmd + "--check --apply -"
--


This looks like a straightforward change, but can you give a
bit more background on why a full index is required?  Do you
mean that "git apply" will reject a patch with abbreviated
blob object names?

-- Pete


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[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.py
index cdfa2df..4ee6739 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap):
 else:
 die("unknown modifier %s for %s" % (modifier, path))
 
-diffcmd = "git diff-tree -p \"%s\"" % (id)
+diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
 patchcmd = diffcmd + " | git apply "
 tryPatchCmd = patchcmd + "--check -"
 applyPatchCmd = patchcmd + "--check --apply -"
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html