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

[PATCH v5 0/7] Add --graft option to git replace

From
Christian Couder <chriscool@tuxfamily.org>
Date
Jun 28, 2014, 18:11 UTC
Message-ID
<20140628171731.5687.30308.chriscool@tuxfamily.org>
Here is a small patch series to implement:
        git replace [-f] --graft <commit> [<parent>...]

This patch series goes on top of the patch series that implements --edit.

The changes since v4, thanks to Junio and Peff, are:
- The series has been rebased on top of Peff's series
  to store the commit buffer length
  (jk/commit-buffer-length). This changes patch 1/7
  and fixes the problem that we lost everything after
  a NUL byte in the commit buffer. 
- Patches 5/7, 6/7 and 7/7 have been added to lose
  a gpg signature in the original commit buffer.
  
Notes:
- Maybe patches could be reordered or squashed, but
  I prefered not to do it in this round so that
  changes compared to previous version are easier to
  spot.
- Junio suggested to drop the merge-tag of a parent
  we are not going to keep, but to keep the merge-tag
  of a parent we are keeping. This has not yet been
  done. It is unfortunate that merge-tags don't use
  a format like the trailer format, because we could
  have factorised droping a merge-tag in the
  "git interpret-trailers" command.
Christian Couder (7):
  replace: add --graft option
  replace: add test for --graft
  Documentation: replace: add --graft option
  contrib: add convert-grafts-to-replace-refs.sh
  replace: refactor replacing parents
  replace: remove signature when using --graft
  replace: add test for --graft with signed commit
 Documentation/git-replace.txt             | 10 ++++
 builtin/replace.c                         | 79 ++++++++++++++++++++++++++++++-
 commit.c                                  | 34 +++++++++++++
 commit.h                                  |  2 +
 contrib/convert-grafts-to-replace-refs.sh | 28 +++++++++++
 t/t6050-replace.sh                        | 34 +++++++++++++
 6 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100755 contrib/convert-grafts-to-replace-refs.sh
-- 
2.0.0.421.g786a89d.dirty
Next: Christian Couder
Message 1 of 17 in “Add --graft option to git replace”
  1. 0/7 Add --graft option to git replaceChristian Couder, Jun 28, 2014
  2. 1/7 replace: add --graft optionChristian Couder, Jun 28, 2014
  3. 2/7 replace: add test for --graftChristian Couder, Jun 28, 2014
  4. Junio C HamanoJul 2, 2014
  5. Christian CouderJul 3, 2014
  6. Junio C HamanoJul 3, 2014
  7. 3/7 Documentation: replace: add --graft optionChristian Couder, Jun 28, 2014
  8. 4/7 contrib: add convert-grafts-to-replace-refs.shChristian Couder, Jun 28, 2014
  9. 5/7 replace: refactor replacing parentsChristian Couder, Jun 28, 2014
  10. Junio C HamanoJul 2, 2014
  11. Christian CouderJul 3, 2014
  12. 6/7 replace: remove signature when using --graftChristian Couder, Jun 28, 2014
  13. Junio C HamanoJul 2, 2014
  14. Christian CouderJul 3, 2014
  15. 7/7 replace: add test for --graft with signed commitChristian Couder, Jun 28, 2014
  16. Junio C HamanoJul 2, 2014
  17. Christian CouderJul 3, 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.