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

[PATCH v6 00/10] Add --graft option to git replace

From
Christian Couder <chriscool@tuxfamily.org>
Date
Jul 7, 2014, 06:35 UTC
Message-ID
<20140707063342.3708.83493.chriscool@tuxfamily.org>
Here is a small 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 v5, thanks to Junio, are:
- new patch 1/10 to clean up redirection style in t6050
- new patches 8/10, 9/10 and 10/10 to check mergetags
- add functions to test parents in patch 3/10 and 7/10
- improve testing signed commits in patch 7/10
- improve warning when removing commit signature in
  patch 6/10
Christian Couder (10):
  replace: cleanup redirection style in tests
  replace: add --graft option
  replace: add test for --graft
  Documentation: replace: add --graft option
  contrib: add convert-grafts-to-replace-refs.sh
  replace: remove signature when using --graft
  replace: add test for --graft with signed commit
  commit: add for_each_mergetag()
  replace: check mergetags when using --graft
  replace: add test for --graft with a mergetag
 Documentation/git-replace.txt             |  10 +++
 builtin/replace.c                         | 126 +++++++++++++++++++++++++++-
 commit.c                                  |  47 +++++++++++
 commit.h                                  |   7 ++
 contrib/convert-grafts-to-replace-refs.sh |  28 +++++++
 log-tree.c                                |  15 +---
 t/t6050-replace.sh                        | 135 ++++++++++++++++++++++++------
 7 files changed, 332 insertions(+), 36 deletions(-)
 create mode 100755 contrib/convert-grafts-to-replace-refs.sh
-- 
2.0.0.421.g786a89d.dirty
Next: Christian Couder
Message 1 of 26 in “Add --graft option to git replace”
  1. 00/10 Add --graft option to git replaceChristian Couder, Jul 7, 2014
  2. 01/10 replace: cleanup redirection style in testsChristian Couder, Jul 7, 2014
  3. 02/10 replace: add --graft optionChristian Couder, Jul 7, 2014
  4. Junio C HamanoJul 9, 2014
  5. Christian CouderJul 10, 2014
  6. Junio C HamanoJul 10, 2014
  7. Junio C HamanoJul 10, 2014
  8. Christian CouderJul 11, 2014
  9. Junio C HamanoJul 11, 2014
  10. Christian CouderJul 11, 2014
  11. Junio C HamanoJul 11, 2014
  12. Jeff KingJul 11, 2014
  13. 03/10 replace: add test for --graftChristian Couder, Jul 7, 2014
  14. Junio C HamanoJul 7, 2014
  15. Christian CouderJul 8, 2014
  16. 04/10 Documentation: replace: add --graft optionChristian Couder, Jul 7, 2014
  17. 05/10 contrib: add convert-grafts-to-replace-refs.shChristian Couder, Jul 7, 2014
  18. 06/10 replace: remove signature when using --graftChristian Couder, Jul 7, 2014
  19. 07/10 replace: add test for --graft with signed commitChristian Couder, Jul 7, 2014
  20. 08/10 commit: add for_each_mergetag()Christian Couder, Jul 7, 2014
  21. Junio C HamanoJul 7, 2014
  22. Christian CouderJul 8, 2014
  23. 09/10 replace: check mergetags when using --graftChristian Couder, Jul 7, 2014
  24. Junio C HamanoJul 7, 2014
  25. Christian CouderJul 8, 2014
  26. 10/10 replace: add test for --graft with a mergetagChristian Couder, Jul 7, 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.