git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 8/8] use smudgeToFile filter in recursive merge

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 22, 2016, 22:45 UTC
Message-ID
<xmqqy45wkflp.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<xmqq7fdglx83.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
>> +			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.
Previous: Junio C HamanoNext: Joey Hess
Message 9 of 12 in “extend smudge/clean filters with direct file access (for pu)”
  1. 0/8 extend smudge/clean filters with direct file access (for pu)Joey Hess, Jun 22, 2016
  2. 4/8 use smudgeToFile in git checkout etcJoey Hess, Jun 22, 2016
  3. 2/8 add smudgeToFile and cleanFromFile filter configsJoey Hess, Jun 22, 2016
  4. 1/8 clarify %f documentationJoey Hess, Jun 22, 2016
  5. 3/8 use cleanFromFile in git addJoey Hess, Jun 22, 2016
  6. 5/8 warn on unusable smudgeToFile/cleanFromFile configJoey Hess, Jun 22, 2016
  7. 8/8 use smudgeToFile filter in recursive mergeJoey Hess, Jun 22, 2016
  8. Junio C HamanoJun 22, 2016
  9. Junio C HamanoJun 22, 2016
  10. 6/8 better recovery from failure of smudgeToFile filterJoey Hess, Jun 22, 2016
  11. 7/8 use smudgeToFile filter in git amJoey Hess, Jun 22, 2016
  12. Junio C HamanoJun 22, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.