From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Mar 2026 19:31:32 +0000 (-0700)
Subject: Merge branch 'ps/history-split'
X-Git-Tag: v2.54.0-rc0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e6a7cd63793459c397dd9e1d772c41f997067a;p=thirdparty%2Fgit.git

Merge branch 'ps/history-split'

"git history" learned the "split" subcommand.

* ps/history-split:
  builtin/history: implement "split" subcommand
  builtin/history: split out extended function to create commits
  cache-tree: allow writing in-memory index as tree
  add-patch: allow disabling editing of hunks
  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"
---

49e6a7cd63793459c397dd9e1d772c41f997067a
diff --cc builtin/checkout.c
index 1d1667fa4c,f8b3a7b08c..e031e61886
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -888,10 -888,11 +888,11 @@@ static int merge_working_tree(const str
  			 */
  
  			add_files_to_cache(the_repository, NULL, NULL, NULL, 0,
 -					   0);
 +					0, 0);
  			init_ui_merge_options(&o, the_repository);
  			o.verbosity = 0;
- 			work = write_in_core_index_as_tree(the_repository);
+ 			work = write_in_core_index_as_tree(the_repository,
+ 							   the_repository->index);
  
  			ret = reset_tree(new_tree,
  					 opts, 1,
diff --cc t/meson.build
index 026bf02fd6,2d578ef58b..8757b29595
--- a/t/meson.build
+++ b/t/meson.build
@@@ -393,9 -390,9 +393,10 @@@ integration_tests = 
    't3436-rebase-more-options.sh',
    't3437-rebase-fixup-options.sh',
    't3438-rebase-broken-files.sh',
 +  't3440-rebase-trailer.sh',
    't3450-history.sh',
    't3451-history-reword.sh',
+   't3452-history-split.sh',
    't3500-cherry.sh',
    't3501-revert-cherry-pick.sh',
    't3502-cherry-pick-merge.sh',