From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:44:36 +0000 (-0700)
Subject: Merge branch 'gr/add-e-use-apply-api' into seen
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eabdca61b09d415fe0c3c74bc9a26b9f33df354f;p=thirdparty%2Fgit.git

Merge branch 'gr/add-e-use-apply-api' into seen

The application of the edited patch in 'git add -e' has been
refactored to use the internal apply API directly, avoiding the need
to spawn a 'git apply' subprocess.

* gr/add-e-use-apply-api:
  builtin/add.c: replace run_command() with direct apply_all_patches() call
---

eabdca61b09d415fe0c3c74bc9a26b9f33df354f
diff --cc builtin/add.c
index eab8f03cad,20a86a1611..629d4366b6
--- a/builtin/add.c
+++ b/builtin/add.c
@@@ -23,10 -22,9 +22,10 @@@
  #include "diff.h"
  #include "read-cache.h"
  #include "revision.h"
- #include "strvec.h"
  #include "submodule.h"
  #include "add-interactive.h"
 +#include "merge-ll.h"
+ #include "apply.h"
  
  static const char * const builtin_add_usage[] = {
  	N_("git add [<options>] [--] <pathspec>..."),