From: Eric Wong <normalperson@...>
Date: 2016-04-26T19:51:33+00:00
Subject: [ruby-core:75204] Re: [Ruby trunk Bug#12283] Obsolete ChangeLog and commit message in Git-style

naruse@airemix.jp wrote:
> 1. Write a commit message in Git-style.
> 
>   * Line 1: summary of commit (around 80 characters or less, <50 is better)
>   * Line 2: empty line
>   * Line 3-: More detailed explanation of commit

Fwiw, I already do that in my commits.   I would also like
stable branch maintainers to maintain the summary when merging,
and refer to trunk commit in message body.
(Use "-x" in "git cherry-pick -x")

For example, oneline view of ten v2_3.0..v2_3_1 changes in Ruby
is not very informative by itself:

  $ git log --abbrev-commit --pretty=oneline -10 v2_3_0..v2_3_1
  5827d8e add tag v2_3_1
  394fa89 version.h: bump up teeny. 2.3.0 -> 2.3.1.
  52c883b merge revision(s) 53320,54756: [Backport #12246]
  2d360c5 merge revision(s) 54755: [Backport #12313]
  7f36210 merge revision(s) 54758:
  6ccc9e9 merge revision(s) 54716,54719,54750: [Backport #12314]
  7b70f0e merge revision(s) 54720: [Backport #12184]
  ab3376b merge revision(s) 54681: [Backport #12302]
  b8aa410 merge revision(s) 54141,54542,54548: [Backport #12082]
  9224427 merge revision(s) 54423,54489: [Backport #12201] [Backport #12202]

Compare the above output with Linux v4.5.1..v4.5.2:

  $ git log --abbrev-commit --pretty=oneline -10 v4.5.1..v4.5.2
  92b8a3b Linux 4.5.2
  9378a3b staging: android: ion: Set the length of the DMA sg entries in buffer
  383b59f HID: usbhid: fix inconsistent reset/resume/reset-resume behavior
  2fa2fc1 HID: wacom: fix Bamboo ONE oops
  9bfe5a5 ALSA: usb-audio: Skip volume controls triggers hangup on Dell USB Dock
  1b040b3 ALSA: usb-audio: Add a quirk for Plantronics BT300
  4e088a6 ALSA: usb-audio: Add a sample rate quirk for Phoenix Audio TMX320
  0e3d5c4 ALSA: hda/realtek - Enable the ALC292 dock fixup on the Thinkpad T460s
  285947f ALSA: hda - Fix regression of monitor_present flag in eld proc file
  9e91bf3 mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers

Note: I suggest cloning linux.git with bundle for resumability and
to reduce server load:

  https://www.kernel.org/cloning-linux-from-a-bundle.html

(Git hackers thinking of ways to make cloning large repos more
 efficient and resumable :)

Unsubscribe: <mailto:ruby-core-request@ruby-lang.org?subject=unsubscribe>
<http://lists.ruby-lang.org/cgi-bin/mailman/options/ruby-core>