git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tolga ceylan <tolga.ceylan@gmail.com>
To: Pete Wyckoff <pw@padd.com>
Cc: git@vger.kernel.org, cdleonard@gmail.com
Subject: Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches
Date: Sat, 26 Apr 2014 14:31:33 -0700	[thread overview]
Message-ID: <535C25B5.4050506@gmail.com> (raw)
In-Reply-To: <535C2138.3050400@gmail.com>



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 '<filename>' without full index line
error: <filename>: patch does not apply

Cheers,
Tolga

  reply	other threads:[~2014-04-26 21:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-25  4:46 [PATCH] git-p4: format-patch to diff-tree change breaks binary patches Tolga Ceylan
2014-04-26 12:43 ` Pete Wyckoff
2014-04-26 21:12   ` tolga ceylan
2014-04-26 21:31     ` tolga ceylan [this message]
2014-05-03  5:40       ` tolga ceylan
2014-05-05 13:14         ` Pete Wyckoff
  -- strict thread matches above, loose matches on Subject: below --
2014-05-07  5:48 Tolga Ceylan
2014-05-07 17:27 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=535C25B5.4050506@gmail.com \
    --to=tolga.ceylan@gmail.com \
    --cc=cdleonard@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=pw@padd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).