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

[PATCH 00/19] Implement the git add --patch backend in C

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Dec 13, 2019, 08:07 UTC
Message-ID
<pull.173.git.1576224486.gitgitgadget@gmail.com>

Out of all the patch series on the journey to provide git add --interactive and git add --patch in built-in versions, this is the big one, as can be expected from the fact that the git add --patch functionality makes up over half of the 1,800+ lines of git-add--interactive.perl.

The two patches that stick out are of course the ones to implement hunk splitting and hunk editing: these operations are fundamentally more complicated, and less obvious, than the entire rest of the operations.

Johannes Schindelin (19):
  built-in add -i: start implementing the `patch` functionality in C
  built-in add -i: wire up the new C code for the `patch` command
  built-in add -p: show colored hunks by default
  built-in add -p: adjust hunk headers as needed
  built-in add -p: color the prompt and the help text
  built-in add -p: offer a helpful error message when hunk navigation
    failed
  built-in add -p: support multi-file diffs
  built-in add -p: handle deleted empty files
  built-in app -p: allow selecting a mode change as a "hunk"
  built-in add -p: show different prompts for mode changes and deletions
  built-in add -p: implement the hunk splitting feature
  built-in add -p: coalesce hunks after splitting them
  strbuf: add a helper function to call the editor "on an strbuf"
  built-in add -p: implement hunk editing
  built-in add -p: implement the 'g' ("goto") command
  built-in add -p: implement the '/' ("search regex") command
  built-in add -p: implement the 'q' ("quit") command
  built-in add -p: only show the applicable parts of the help text
  built-in add -p: show helpful hint when nothing can be staged
 Makefile                   |    1 +
 add-interactive.c          |   29 +-
 add-interactive.h          |   19 +
 add-patch.c                | 1338 ++++++++++++++++++++++++++++++++++++
 builtin/add.c              |   15 +-
 strbuf.c                   |   28 +
 strbuf.h                   |   11 +
 t/t3701-add-interactive.sh |   42 ++
 8 files changed, 1464 insertions(+), 19 deletions(-)
 create mode 100644 add-patch.c
base-commit: b4bbbbd5a247e0e75d079bca591b657ec9084a46
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-173%2Fdscho%2Fadd-p-in-c-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-173/dscho/add-p-in-c-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/173
-- 
gitgitgadget
Next: Johannes Schindelin via GitGitGadget
Message 1 of 20 in “Implement the git add --patch backend in C”
  1. 00/19 Implement the git add --patch backend in CJohannes Schindelin via GitGitGadget, Dec 13, 2019
  2. 02/19 built-in add -i: wire up the new C code for the `patch` commandJohannes Schindelin via GitGitGadget, Dec 13, 2019
  3. 01/19 built-in add -i: start implementing the `patch` functionality in CJohannes Schindelin via GitGitGadget, Dec 13, 2019
  4. 03/19 built-in add -p: show colored hunks by defaultJohannes Schindelin via GitGitGadget, Dec 13, 2019
  5. 07/19 built-in add -p: support multi-file diffsJohannes Schindelin via GitGitGadget, Dec 13, 2019
  6. 06/19 built-in add -p: offer a helpful error message when hunk navigation failedJohannes Schindelin via GitGitGadget, Dec 13, 2019
  7. 10/19 built-in add -p: show different prompts for mode changes and deletionsJohannes Schindelin via GitGitGadget, Dec 13, 2019
  8. 09/19 built-in app -p: allow selecting a mode change as a "hunk"Johannes Schindelin via GitGitGadget, Dec 13, 2019
  9. 13/19 strbuf: add a helper function to call the editor "on an strbuf"Johannes Schindelin via GitGitGadget, Dec 13, 2019
  10. 12/19 built-in add -p: coalesce hunks after splitting themJohannes Schindelin via GitGitGadget, Dec 13, 2019
  11. 15/19 built-in add -p: implement the 'g' ("goto") commandJohannes Schindelin via GitGitGadget, Dec 13, 2019
  12. 14/19 built-in add -p: implement hunk editingJohannes Schindelin via GitGitGadget, Dec 13, 2019
  13. 11/19 built-in add -p: implement the hunk splitting featureJohannes Schindelin via GitGitGadget, Dec 13, 2019
  14. 19/19 built-in add -p: show helpful hint when nothing can be stagedJohannes Schindelin via GitGitGadget, Dec 13, 2019
  15. 18/19 built-in add -p: only show the applicable parts of the help textJohannes Schindelin via GitGitGadget, Dec 13, 2019
  16. 16/19 built-in add -p: implement the '/' ("search regex") commandJohannes Schindelin via GitGitGadget, Dec 13, 2019
  17. 17/19 built-in add -p: implement the 'q' ("quit") commandJohannes Schindelin via GitGitGadget, Dec 13, 2019
  18. 08/19 built-in add -p: handle deleted empty filesJohannes Schindelin via GitGitGadget, Dec 13, 2019
  19. 04/19 built-in add -p: adjust hunk headers as neededJohannes Schindelin via GitGitGadget, Dec 13, 2019
  20. 05/19 built-in add -p: color the prompt and the help textJohannes Schindelin via GitGitGadget, Dec 13, 2019

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.