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

Re: [PATCH 1/7] fmt-merge-msg: be quiet if nothing to merge

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 25, 2010, 02:39 UTC
Message-ID
<7vaatxdt0d.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1269414964-9518-2-git-send-email-bebarino@gmail.com>
Stephen Boyd <bebarino@gmail.com> writes:
> When FETCH_HEAD contains only 'not-for-merge' entries fmt-merge-msg
> still outputs "Merge" (and if the branch isn't master " into <branch>").
> In this case fmt-merge-msg is outputting junk and should really just
> be quiet. Fix it.
Hmm, doesn't pull fail in such a case anyway?  Is there a real damage?

I am just trying asses if this is with a maint-worthy urgency. The patch looks sane.

Thanks.
Previous: Stephen BoydNext: Stephen Boyd
Message 3 of 17 in “fmt-merge-msg improvements”
  1. 0/7 fmt-merge-msg improvementsStephen Boyd, Mar 24, 2010
  2. 1/7 fmt-merge-msg: be quiet if nothing to mergeStephen Boyd, Mar 24, 2010
  3. Junio C HamanoMar 25, 2010
  4. Stephen BoydMar 25, 2010
  5. 2/7 t6200: modernize with test_tickStephen Boyd, Mar 24, 2010
  6. 3/7 t6200: test fmt-merge-msg moreStephen Boyd, Mar 24, 2010
  7. 4/7 fmt-merge-msg: use pretty.c routinesStephen Boyd, Mar 24, 2010
  8. 5/7 string-list: add unsorted_string_list_lookup()Stephen Boyd, Mar 24, 2010
  9. 6/7 fmt-merge-msg: remove custom string_list implementationStephen Boyd, Mar 24, 2010
  10. Junio C HamanoMar 30, 2010
  11. Stephen BoydApr 1, 2010
  12. 8/7 Make string_list_append() consistent with everything elseStephen Boyd, Apr 1, 2010
  13. Julian PhillipsApr 1, 2010
  14. 7/7 fmt-merge-msg: hide summary optionStephen Boyd, Mar 24, 2010
  15. Junio C HamanoMar 25, 2010
  16. Stephen BoydMar 25, 2010
  17. Junio C HamanoMar 26, 2010

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.