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

git-fmt-merge-message problem..

From
Linus Torvalds <torvalds@osdl.org>
Date
Jul 13, 2006, 04:38 UTC
Message-ID
<Pine.LNX.4.64.0607122133250.5623@g5.osdl.org>
Not a huge one, but it's ugly.
When I did a "git pull repo", the merge messages _used_ to look like this:
    Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
    
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [NEIGH]: Fix IP-over-ATM and ARP interaction.
      [TG3]: ethtool always report port is TP.
or (if I specified a branch):
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ro
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infini
      IB/mthca: FMR ioremap fix
      IPoIB: Free child interfaces properly
      IB/mthca: Fix race in reference counting
      IB/srp: Fix tracking of pending requests during error handling
      IB: Fix display of 4-bit port counters in sysfs
but now they look like this:
    Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
    
    * HEAD:
      [NET]: fix __sk_stream_mem_reclaim
      [Bluetooth] Fix deadlock in the L2CAP layer
      [Bluetooth] Let BT_HIDP depend on INPUT
      [Bluetooth] Avoid NULL pointer dereference with tty->driver
      [Bluetooth] Remaining transitions to use kzalloc()
      [WAN]: converting generic HDLC to use netif_dormant*()
      [IPV4]: Fix error handling for fib_insert_node call
      [NETROM] lockdep: fix false positive
      ....

which makes no sense AT ALL. It's doesn't even parse. "Merge commit <repo> of <branch>"? Whaa? That's just insane.

Also, the " * HEAD" is just ugly. It was better before.

Dscho? Can you please make git fmt-merge-message print out something sensible again? It doesn't have to match the old behaviour 100%, but the current one is just ugly and senseless.

			Linus
Next: Junio C Hamano
Message 1 of 6 in “git-fmt-merge-message problem..”
  1. Linus TorvaldsJul 13, 2006
  2. Junio C HamanoJul 13, 2006
  3. Junio C HamanoJul 13, 2006
  4. Linus TorvaldsJul 13, 2006
  5. Junio C HamanoJul 13, 2006
  6. Johannes SchindelinJul 13, 2006

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.