merge.h: move declarations for merge.c from cache.h

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2023-05-16 06:33:54 +00:00 committed by Junio C Hamano
parent eaa966db79
commit 750324ddb8
6 changed files with 21 additions and 11 deletions

View file

@ -37,6 +37,7 @@
#include "color.h" #include "color.h"
#include "rerere.h" #include "rerere.h"
#include "help.h" #include "help.h"
#include "merge.h"
#include "merge-recursive.h" #include "merge-recursive.h"
#include "merge-ort-wrappers.h" #include "merge-ort-wrappers.h"
#include "resolve-undo.h" #include "resolve-undo.h"

View file

@ -12,6 +12,7 @@
#include "builtin.h" #include "builtin.h"
#include "gettext.h" #include "gettext.h"
#include "hex.h" #include "hex.h"
#include "merge.h"
#include "object-name.h" #include "object-name.h"
#include "parse-options.h" #include "parse-options.h"
#include "exec-cmd.h" #include "exec-cmd.h"

11
cache.h
View file

@ -527,15 +527,4 @@ int add_files_to_cache(struct repository *repo, const char *prefix,
void overlay_tree_on_index(struct index_state *istate, void overlay_tree_on_index(struct index_state *istate,
const char *tree_name, const char *prefix); const char *tree_name, const char *prefix);
/* merge.c */
struct commit_list;
int try_merge_command(struct repository *r,
const char *strategy, size_t xopts_nr,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes);
int checkout_fast_forward(struct repository *r,
const struct object_id *from,
const struct object_id *to,
int overwrite_ignore);
#endif /* CACHE_H */ #endif /* CACHE_H */

View file

@ -4,6 +4,7 @@
#include "gettext.h" #include "gettext.h"
#include "hex.h" #include "hex.h"
#include "lockfile.h" #include "lockfile.h"
#include "merge.h"
#include "commit.h" #include "commit.h"
#include "run-command.h" #include "run-command.h"
#include "resolve-undo.h" #include "resolve-undo.h"

17
merge.h Normal file
View file

@ -0,0 +1,17 @@
#ifndef MERGE_H
#define MERGE_H
struct commit_list;
struct object_id;
struct repository;
int try_merge_command(struct repository *r,
const char *strategy, size_t xopts_nr,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes);
int checkout_fast_forward(struct repository *r,
const struct object_id *from,
const struct object_id *to,
int overwrite_ignore);
#endif /* MERGE_H */

View file

@ -25,6 +25,7 @@
#include "diff.h" #include "diff.h"
#include "revision.h" #include "revision.h"
#include "rerere.h" #include "rerere.h"
#include "merge.h"
#include "merge-ort.h" #include "merge-ort.h"
#include "merge-ort-wrappers.h" #include "merge-ort-wrappers.h"
#include "refs.h" #include "refs.h"