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 <tolga.cey...@gmail.com>
> ---
> 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
