Skip to content
Permalink
Browse files
Merge pull request #2150 from dscho/add-p-gfw
Offer a built-in version of `git add -i` and `git add -p`
  • Loading branch information
dscho committed May 8, 2019
2 parents 59a40ee + ee77788 commit a930c5a836ca746e20a6ed0bf4fe633acd79ff74
Showing with 3,449 additions and 91 deletions.
  1. +5 −0 Documentation/config/add.txt
  2. +4 −0 Makefile
  3. +1,070 −0 add-interactive.c
  4. +51 −0 add-interactive.h
  5. +1,562 −0 add-patch.c
  6. +10 −0 apply.c
  7. +44 −6 builtin/add.c
  8. +8 −3 builtin/commit.c
  9. +15 −12 builtin/stash.c
  10. +1 −0 ci/run-build-and-tests.sh
  11. +2 −1 commit.h
  12. +247 −32 compat/terminal.c
  13. +3 −0 compat/terminal.h
  14. +15 −22 diff.c
  15. +19 −0 diff.h
  16. +5 −3 git-add--interactive.perl
  17. +2 −2 git-legacy-stash.sh
  18. +111 −0 prefix-map.c
  19. +40 −0 prefix-map.h
  20. +19 −0 repository.c
  21. +7 −0 repository.h
  22. +4 −0 t/README
  23. +58 −0 t/helper/test-prefix-map.c
  24. +1 −0 t/helper/test-tool.c
  25. +1 −0 t/helper/test-tool.h
  26. +10 −0 t/t0016-prefix-map.sh
  27. +132 −7 t/t3701-add-interactive.sh
  28. +3 −3 t/t3904-stash-patch.sh
@@ -5,3 +5,8 @@ add.ignore-errors (deprecated)::
option of linkgit:git-add[1]. `add.ignore-errors` is deprecated,
as it does not follow the usual naming convention for configuration
variables.

add.interactive.useBuiltin::
[EXPERIMENTAL] Set to `true` to use the experimental built-in
implementation of the interactive version of linkgit:git-add[1]
instead of the Perl script version. Is `false` by default.
@@ -757,6 +757,7 @@ TEST_BUILTINS_OBJS += test-online-cpus.o
TEST_BUILTINS_OBJS += test-parse-options.o
TEST_BUILTINS_OBJS += test-path-utils.o
TEST_BUILTINS_OBJS += test-pkt-line.o
TEST_BUILTINS_OBJS += test-prefix-map.o
TEST_BUILTINS_OBJS += test-prio-queue.o
TEST_BUILTINS_OBJS += test-reach.o
TEST_BUILTINS_OBJS += test-read-cache.o
@@ -852,6 +853,8 @@ LIB_H := $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
-name '*.h' -print)

LIB_OBJS += abspath.o
LIB_OBJS += add-interactive.o
LIB_OBJS += add-patch.o
LIB_OBJS += advice.o
LIB_OBJS += alias.o
LIB_OBJS += alloc.o
@@ -970,6 +973,7 @@ LIB_OBJS += patch-ids.o
LIB_OBJS += path.o
LIB_OBJS += pathspec.o
LIB_OBJS += pkt-line.o
LIB_OBJS += prefix-map.o
LIB_OBJS += preload-index.o
LIB_OBJS += pretty.o
LIB_OBJS += prio-queue.o
Loading

0 comments on commit a930c5a

Please sign in to comment.