Skip to content

Implement the git add --patch backend in C

Johannes Schindelin via GitGitGadget git 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19built-in add -i: start implementing the `patch` functionality in CMakefile add-interactive.h add-patch.c +1 more+277 -50 replies
2/19built-in add -i: wire up the new C code for the `patch` commandadd-interactive.c+6 -30 replies
3/19built-in add -p: show colored hunks by defaultadd-patch.c+62 -170 replies
4/19built-in add -p: adjust hunk headers as neededadd-interactive.c add-interactive.h add-patch.c+151 -230 replies
5/19built-in add -p: color the prompt and the help textadd-patch.c+8 -40 replies
6/19built-in add -p: offer a helpful error message when hunk navigation failedadd-patch.c+33 -110 replies
7/19built-in add -p: support multi-file diffsadd-patch.c+53 -380 replies
8/19built-in add -p: handle deleted empty filesadd-patch.c+11 -20 replies
9/19built-in app -p: allow selecting a mode change as a "hunk"add-patch.c+104 -50 replies
10/19built-in add -p: show different prompts for mode changes and deletionsadd-patch.c+20 -20 replies
11/19built-in add -p: implement the hunk splitting featureadd-patch.c t/t3701-add-interactive.sh+225 -20 replies
12/19built-in add -p: coalesce hunks after splitting themadd-patch.c+57 -10 replies
13/19strbuf: add a helper function to call the editor "on an strbuf"strbuf.c strbuf.h+39 -00 replies
14/19built-in add -p: implement hunk editingadd-interactive.c add-interactive.h add-patch.c+325 -170 replies
15/19built-in add -p: implement the 'g' ("goto") commandadd-patch.c t/t3701-add-interactive.sh+104 -00 replies
16/19built-in add -p: implement the '/' ("search regex") commandadd-patch.c t/t3701-add-interactive.sh+63 -10 replies
17/19built-in add -p: implement the 'q' ("quit") commandadd-patch.c+11 -60 replies
18/19built-in add -p: only show the applicable parts of the help textadd-patch.c+28 -40 replies
19/19built-in add -p: show helpful hint when nothing can be stagedadd-patch.c+13 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

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

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

Signature · 1 line
gitgitgadget