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

Re: Feature request: "author branch" in commit object

From
Ed Hutchins <eh@demeterr.com>
Date
Jul 3, 2013, 17:31 UTC
Message-ID
<CADL+T9bbnGSxCjUBqoL3qm7Ss-j9jxorED0L1A6v1NbeLBpRQg@mail.gmail.com>
In-Reply-To
<CALWbr2zJFjbaCdA3d1eaFuP4HGShAwnK=gisRD=KHKWWi-XuTg@mail.gmail.com>

I might be able to switch our corporate workflow to adding non-ff merge commits, but the reason we moved away from using github's big red button in the first place was to avoid the extra noise of merge-only commits.

Actually you've pointed out an inconsistency: why is it okay for merge commits to automatically mention branch names, but for regular commits this is considered harmful?

On Wed, Jul 3, 2013 at 9:16 AM, Antoine Pelisse <apelisse@gmail.com> wrote:
Show 28 quoted lines
> On Tue, Jul 2, 2013 at 10:34 PM, Ed Hutchins <eh@demeterr.com> wrote:
>> On the other hand
>> trying to figure
>> out the history of events from a large directed graph of commits
>> without any clue about
>> what topics first spawned each commit is actively harmful in many
>> cases (trying to display
>> a clear history of who did what for what reasons, for example).
>
> I think this is exactly what Junio does with git.git:
> - Each branch is named "$initials/$topicname" before being merged.
> - Branches are always merged with --no-ff.
>
> I think it answers your question: Who (initials) does what (topic)
> The name of the branch is also stuck as part of the history as the
> merge reads the name of the merged branch:
>
> e.g. Merge branch 'rr/remote-branch-config-refresh'
>
> You can of course provide more information than the simple commit
> header line (that would give the "what reasons").
>
> Of course, it's even easier to read if you always merge in the same
> direction (that allows you to easily find the first commit of the
> branch).
>
> Hope that helps,
> Antoine
Previous: Antoine PelisseNext: Junio C Hamano
Message 6 of 17 in “Feature request: "author branch" in commit object”
  1. Ed HutchinsJul 2, 2013
  2. Fredrik GustafssonJul 2, 2013
  3. Junio C HamanoJul 2, 2013
  4. Ed HutchinsJul 2, 2013
  5. Antoine PelisseJul 3, 2013
  6. Ed HutchinsJul 3, 2013
  7. Junio C HamanoJul 3, 2013
  8. Andrew ArdillJul 4, 2013
  9. Johan HerlandJul 2, 2013
  10. Matthieu MoyJul 3, 2013
  11. Ed HutchinsJul 3, 2013
  12. Junio C HamanoJul 3, 2013
  13. Jakub NarebskiJul 3, 2013
  14. DanyJul 3, 2013
  15. DanyJul 3, 2013
  16. Matthieu MoyJul 4, 2013
  17. Philip OakleyJul 9, 2013

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.