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

[PATCH v7 00/12] Improvements to cherry-pick

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Apr 24, 2014, 02:44 UTC
Message-ID
<1398307491-21314-1-git-send-email-felipe.contreras@gmail.com>
Hi,

In the process of revamping 'git rebase' I found many areas of improvments in `git cherry-pick`, here are the patches to improve the situation.

These were prettuch sent before already, but this time I dropped the second part of the series to improve 'git rebase'.

Felipe Contreras (12):
  cherry-pick: don't barf when there's nothing to do
  cherry-pick: add --skip-empty option
  revert/cherry-pick: add --quiet option
  revert/cherry-pick: add --skip option
  cherry-pick: remember rerere-autoupdate
  builtin: add rewrite helper
  cherry-pick: store rewritten commits
  cherry-pick: don't store skipped commit
  builtin: move run_rewrite_hook() to rewrite.c
  builtin: rewrite: add copy_rewrite_notes()
  cherry-pick: add --action-name option
  cherry-pick: copy notes and run hooks
 Documentation/config.txt            |   9 ++-
 Documentation/git-cherry-pick.txt   |  10 ++-
 Documentation/git-revert.txt        |   7 ++-
 Documentation/githooks.txt          |   8 +--
 Documentation/sequencer.txt         |   3 +
 Makefile                            |   2 +
 builtin/commit.c                    |  46 ++------------
 builtin/revert.c                    |  11 ++++
 git-rebase--interactive.sh          |   4 +-
 rewrite.c                           | 121 ++++++++++++++++++++++++++++++++++++
 rewrite.h                           |  20 ++++++
 sequencer.c                         | 105 ++++++++++++++++++++++++++++---
 sequencer.h                         |   8 ++-
 t/t3504-cherry-pick-rerere.sh       |  39 ++++++++++++
 t/t3508-cherry-pick-many-commits.sh |  13 ++++
 t/t3510-cherry-pick-sequence.sh     |  14 ++++-
 t/t3512-revert-cherry-notes.sh      |  18 ++++++
 t/t5407-post-rewrite-hook.sh        |  16 +++++
 18 files changed, 392 insertions(+), 62 deletions(-)
 create mode 100644 rewrite.c
 create mode 100644 rewrite.h
 create mode 100755 t/t3512-revert-cherry-notes.sh
-- 
1.9.2+fc1.2.gfbaae8c
Next: Felipe Contreras
Message 1 of 23 in “Improvements to cherry-pick”
  1. 00/12 Improvements to cherry-pickFelipe Contreras, Apr 24, 2014
  2. 01/12 cherry-pick: don't barf when there's nothing to doFelipe Contreras, Apr 24, 2014
  3. 02/12 cherry-pick: add --skip-empty optionFelipe Contreras, Apr 24, 2014
  4. 03/12 revert/cherry-pick: add --quiet optionFelipe Contreras, Apr 24, 2014
  5. Ramkumar RamachandraApr 24, 2014
  6. Felipe ContrerasApr 24, 2014
  7. 04/12 revert/cherry-pick: add --skip optionFelipe Contreras, Apr 24, 2014
  8. Ramkumar RamachandraApr 24, 2014
  9. 05/12 cherry-pick: remember rerere-autoupdateFelipe Contreras, Apr 24, 2014
  10. Eric SunshineApr 24, 2014
  11. 06/12 builtin: add rewrite helperFelipe Contreras, Apr 24, 2014
  12. Ramkumar RamachandraApr 24, 2014
  13. Felipe ContrerasApr 24, 2014
  14. 07/12 cherry-pick: store rewritten commitsFelipe Contreras, Apr 24, 2014
  15. 08/12 cherry-pick: don't store skipped commitFelipe Contreras, Apr 24, 2014
  16. 09/12 builtin: move run_rewrite_hook() to rewrite.cFelipe Contreras, Apr 24, 2014
  17. 10/12 builtin: rewrite: add copy_rewrite_notes()Felipe Contreras, Apr 24, 2014
  18. 11/12 cherry-pick: add --action-name optionFelipe Contreras, Apr 24, 2014
  19. 12/12 cherry-pick: copy notes and run hooksFelipe Contreras, Apr 24, 2014
  20. Ramkumar RamachandraApr 24, 2014
  21. Felipe ContrerasApr 24, 2014
  22. Ramkumar RamachandraApr 24, 2014
  23. Felipe ContrerasApr 24, 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.