From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Nov 2025 23:17:31 +0000 (-0800)
Subject: Merge branch 'ps/history' into seen
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4840347489229d0e76af20f096a87aec33d3c36e;p=thirdparty%2Fgit.git

Merge branch 'ps/history' into seen

"git history" history rewriting UI.

Comments?

* ps/history:
  builtin/history: implement "split" subcommand
  cache-tree: allow writing in-memory index as tree
  add-patch: add support for in-memory index patching
  add-patch: remove dependency on "add-interactive" subsystem
  add-patch: split out `struct interactive_options`
  add-patch: split out header from "add-interactive.h"
  builtin/history: implement "reword" subcommand
  builtin: add new "history" command
  replay: stop using `the_repository`
  replay: extract logic to pick commits
  wt-status: provide function to expose status for trees
---

4840347489229d0e76af20f096a87aec33d3c36e
diff --cc Makefile
index 290f313396,1380ee1e19..c18b7fa3db
--- a/Makefile
+++ b/Makefile
@@@ -1267,13 -1260,8 +1267,14 @@@ LIB_OBJS += reftable/table.
  LIB_OBJS += reftable/tree.o
  LIB_OBJS += reftable/writer.o
  LIB_OBJS += remote.o
 +LIB_OBJS += repack.o
 +LIB_OBJS += repack-cruft.o
 +LIB_OBJS += repack-filtered.o
 +LIB_OBJS += repack-geometry.o
 +LIB_OBJS += repack-midx.o
 +LIB_OBJS += repack-promisor.o
  LIB_OBJS += replace-object.o
+ LIB_OBJS += replay.o
  LIB_OBJS += repo-settings.o
  LIB_OBJS += repository.o
  LIB_OBJS += rerere.o
diff --cc add-patch.c
index 173a53241e,b8d46d54a2..e689932448
--- a/add-patch.c
+++ b/add-patch.c
@@@ -1566,13 -1688,11 +1689,13 @@@ static int patch_update_file(struct add
  						: 1));
  		printf(_(s->mode->prompt_mode[prompt_mode_type]),
  		       s->buf.buf);
- 		if (*s->s.reset_color_interactive)
- 			fputs(s->s.reset_color_interactive, stdout);
+ 		if (*s->cfg.reset_color_interactive)
+ 			fputs(s->cfg.reset_color_interactive, stdout);
  		fflush(stdout);
 -		if (read_single_character(s) == EOF)
 +		if (read_single_character(s) == EOF) {
 +			quit = 1;
  			break;
 +		}
  
  		if (!s->answer.len)
  			continue;
diff --cc meson.build
index e707f35df2,2d789612a0..b07d35609d
--- a/meson.build
+++ b/meson.build
@@@ -463,13 -463,8 +463,14 @@@ libgit_sources = 
    'reftable/tree.c',
    'reftable/writer.c',
    'remote.c',
 +  'repack.c',
 +  'repack-cruft.c',
 +  'repack-filtered.c',
 +  'repack-geometry.c',
 +  'repack-midx.c',
 +  'repack-promisor.c',
    'replace-object.c',
+   'replay.c',
    'repo-settings.c',
    'repository.c',
    'rerere.c',