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

Re: [PATCH v2 2/3] advice: fix an unexpected leading space

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 12, 2024, 17:52 UTC
Message-ID
<xmqqsf32bfsn.fsf@gitster.g>
In-Reply-To
<60a90f4e-b22c-46cb-a79f-a0e01e711732@gmail.com>
Rubén Justo <rjusto@gmail.com> writes:
Show 26 quoted lines
> On 11-ene-2024 17:21:22, Junio C Hamano wrote:
>> Rubén Justo <rjusto@gmail.com> writes:
>> 
>> > [ ... ]
>> > diff --git a/advice.h b/advice.h
>> > index 0f584163f5..2affbe1426 100644
>> > --- a/advice.h
>> > +++ b/advice.h
>> > @@ -49,6 +49,7 @@ struct string_list;
>> >         ADVICE_UPDATE_SPARSE_PATH,
>> >         ADVICE_WAITING_FOR_EDITOR,
>> >         ADVICE_SKIPPED_CHERRY_PICKS,
>> > +       ADVICE_WORKTREE_ADD_ORPHAN,
>> >  };
>> >
>> > Note the hunk header, instead of a much more expected:
>> >
>> > @@ -49,6 +49,7 @@ enum advice_type
>> 
>> Next time, don't include "diff" output in the proposed log message
>> without indenting.  It makes it hard to read and parse.
>
> My fault.  Sorry.
>
> Is there any way to make git-format-patch issue a warning or refuse to
> continue when the resulting patch is not going to be accepted by git-am?

I meant it as primarily to help human readers, but you are right, it will break "am". How about doing it in the pre-commit hook?

Previous: Rubén JustoNext: Junio C Hamano
Message 10 of 12 in “branch: error description when deleting a not fully merged branch”
  1. branch: error description when deleting a not fully merged branchRubén Justo, Jan 10, 2024
  2. Junio C HamanoJan 10, 2024
  3. Junio C HamanoJan 10, 2024
  4. Rubén JustoJan 11, 2024
  5. 0/3 branch: error description when deleting a not fully merged branchRubén Justo, Jan 11, 2024
  6. 1/3 advice: sort the advice related listsRubén Justo, Jan 11, 2024
  7. 2/3 advice: fix an unexpected leading spaceRubén Justo, Jan 11, 2024
  8. Junio C HamanoJan 12, 2024
  9. Rubén JustoJan 12, 2024
  10. Junio C HamanoJan 12, 2024
  11. Junio C HamanoJan 12, 2024
  12. 3/3 branch: make the advice to force-deleting a conditional oneRubén Justo, Jan 11, 2024

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.