diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-24 12:31:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-24 12:31:32 -0700 |
| commit | 49e6a7cd63793459c397dd9e1d772c41f997067a (patch) | |
| tree | bbfabd864e9e59fcfe8e88c5e604f9e153384ae1 /cache-tree.h | |
| parent | dd33e738a469cb7841a4a6132bdce1809d0772aa (diff) | |
| parent | d563ecec2845467880f5742e178a9723afef495a (diff) | |
| download | git-49e6a7cd63793459c397dd9e1d772c41f997067a.tar.xz | |
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"
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cache-tree.h b/cache-tree.h index b82c4963e7..f8bddae523 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -47,7 +47,8 @@ int cache_tree_verify(struct repository *, struct index_state *); #define WRITE_TREE_UNMERGED_INDEX (-2) #define WRITE_TREE_PREFIX_ERROR (-3) -struct tree* write_in_core_index_as_tree(struct repository *repo); +struct tree *write_in_core_index_as_tree(struct repository *repo, + struct index_state *index_state); int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix); void prime_cache_tree(struct repository *, struct index_state *, struct tree *); |