From: Junio C Hamano <gitster@pobox•com>
To: Joey Hess <joeyh@joeyh•name>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v4 8/8] use smudgeToFile filter in recursive merge
Date: Wed, 22 Jun 2016 15:45:22 -0700 [thread overview]
Message-ID: <xmqqy45wkflp.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq7fdglx83.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 22 Jun 2016 14:39:24 -0700")
Junio C Hamano <gitster@pobox•com> writes:
>> + int smudge_to_file = can_smudge_to_file(path);
>
> This does not compile with decl-after-statement. I suspect other
> patches in this series have the same issue but I did not check. Do
> you say "make DEVELOPER=1"?
As a tentative workaround, I've queued a squashable compilation fix
at the tip of the topic after queuing. Please find it in 'pu' when
it gets pushed out sometime later today.
Thanks.
next prev parent reply other threads:[~2016-06-22 22:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 21:09 [PATCH v4 0/8] extend smudge/clean filters with direct file access (for pu) Joey Hess
2016-06-22 21:09 ` [PATCH v4 1/8] clarify %f documentation Joey Hess
2016-06-22 21:09 ` [PATCH v4 2/8] add smudgeToFile and cleanFromFile filter configs Joey Hess
2016-06-22 21:09 ` [PATCH v4 3/8] use cleanFromFile in git add Joey Hess
2016-06-22 21:09 ` [PATCH v4 4/8] use smudgeToFile in git checkout etc Joey Hess
2016-06-22 21:09 ` [PATCH v4 5/8] warn on unusable smudgeToFile/cleanFromFile config Joey Hess
2016-06-22 21:09 ` [PATCH v4 6/8] better recovery from failure of smudgeToFile filter Joey Hess
2016-06-22 21:09 ` [PATCH v4 7/8] use smudgeToFile filter in git am Joey Hess
2016-06-22 21:09 ` [PATCH v4 8/8] use smudgeToFile filter in recursive merge Joey Hess
2016-06-22 21:39 ` Junio C Hamano
2016-06-22 22:45 ` Junio C Hamano [this message]
2016-06-22 21:23 ` [PATCH v4 0/8] extend smudge/clean filters with direct file access (for pu) 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=xmqqy45wkflp.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=joeyh@joeyh$(echo .)name \
/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