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

Re: Code changes in merge commits

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Sep 29, 2014, 10:59 UTC
Message-ID
<vpq8ul2pu9n.fsf@anie.imag.fr>
In-Reply-To
<CAHQ6N+rJDtq_vtfotM+GXLdN_P==oTqGbFZ97ZQea9+mcoRBog@mail.gmail.com>
John Tapsell <johnflux@gmail.com> writes:
> What if merge commits were forced into being always trivial?

It would be relatively easy to "force" a client to always have trivial merges, but much harder to prevent an attacker to forge a non-trivial merge commit (e.g. modifying his local git command) and push it.

> Ideally I'd like to see all the code changes to a code base just with
> "git log -p".

What I'd love to see with "git log -p" is the diff between a trivial merge (possibly including conflict markers) and the actual merge commit. That would imply that "git log" would redo the merge before computing the diff (rather heavyweight :-( ), but an empty diff would mean "no change other than merge", and if any, we would see the conflict resolution or additional changes in the diff.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: John TapsellNext: John Tapsell
Message 3 of 5 in “Code changes in merge commits”
  1. John TapsellSep 29, 2014
  2. John TapsellSep 29, 2014
  3. Matthieu MoySep 29, 2014
  4. John TapsellSep 29, 2014
  5. Duy NguyenSep 29, 2014

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.