From: Per Cederqvist <cederp@opera•com>
To: Jeff Sipek <jeffpc@josefsipek•net>
Cc: git@vger•kernel.org, ceder@lysator•liu.se
Subject: Re: [GUILT] [PATCH] Handle empty patches and patches with only a header.
Date: Wed, 02 May 2012 08:27:33 +0200 [thread overview]
Message-ID: <4FA0D3D5.5080004@opera.com> (raw)
In-Reply-To: <20120430164841.GG20761@poseidon.cudanet.local>
On 04/30/2012 06:48 PM, Jeff Sipek wrote:
> On Mon, Apr 30, 2012 at 12:29:55PM +0200, Per Cederqvist wrote:
>> "git apply --numstat" in Git 1.7.10 gives an error message unless the
>> patch contains a diff, so don't attempt to apply it unless we find a
>
> Find a what? Such a cliff-hanger! :)
>
> I assume you mean find a '^diff'.
Yes. Initially, I searched for "@@" and the commit message
said "diff hunk", but that heuristic failed if you had a
patch that just changed the mode of a single file. So I
changed the patch to search for "^diff" instead, and
apparently got distracted while editing the commit message.
/cederp
> I'll fix up the commit message before applying.
>
> Thanks,
>
> Jeff.
>
>> Signed-off-by: Per Cederqvist<cederp@opera•com>
>> ---
>> guilt | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/guilt b/guilt
>> index 5d619c5..66a671a 100755
>> --- a/guilt
>> +++ b/guilt
>> @@ -622,7 +622,7 @@ push_patch()
>> cd_to_toplevel
>>
>> # apply the patch if and only if there is something to apply
>> - if [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
>> + if grep -q '^diff ' "$p"&& [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
>> if [ "$bail_action" = abort ]; then
>> reject=""
>> fi
>> --
>> 1.7.10
>>
>
prev parent reply other threads:[~2012-05-02 6:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 10:29 [GUILT] [PATCH] Handle empty patches and patches with only a header Per Cederqvist
2012-04-30 16:48 ` Jeff Sipek
2012-05-02 6:27 ` Per Cederqvist [this message]
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=4FA0D3D5.5080004@opera.com \
--to=cederp@opera$(echo .)com \
--cc=ceder@lysator$(echo .)liu.se \
--cc=git@vger$(echo .)kernel.org \
--cc=jeffpc@josefsipek$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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