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

git replace: should it check for object type, and can it replace merges?

From
Philip Oakley <philipoakley@iee.org>
Date
Aug 3, 2013, 15:13 UTC
Message-ID
<24928554D0C34B4696DAD74F569E2E17@PhilipOakley>

A recent comment http://stackoverflow.com/a/18027030/717355 on a question I asked two years ago about 'grafts' and 'replace' indicates that users think that 'git replace' can't replace a merge commit. The documentation doesn't have any examples and gives the naive impression that one should only replace a simple commit with another simple commit.

Having looked at the code, I realised that anything can be replaced with anything, which is perhaps not what was intended. A simple thought is that the replace should be like-for-like with regard to object type, though that would not include replacing a sub-module for a tree (and vice versa).

Should 'git replace' check the object types to ensure they are sensible?

Would it be reasonable to add examples to indicate the range of replacements, and how to prepare alternative merge commits, or is that a hostage to fortune?

Philip Oakley
Next: Thomas Rast
Message 1 of 5 in “git replace: should it check for object type, and can it replace merges?”
  1. Philip OakleyAug 3, 2013
  2. Thomas RastAug 3, 2013
  3. Christian CouderAug 5, 2013
  4. Philip OakleyAug 5, 2013
  5. Junio C HamanoAug 5, 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.