mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
We're about to add a new git-history(1) command that will reuse some of the same infrastructure as git-replay(1). To prepare for this, extract the logic to pick a commit into a new "replay.c" file so that it can be shared between both commands. Rename the function to have a "replay_" prefix to clearly indicate its subsystem. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
24 lines
534 B
C
24 lines
534 B
C
#ifndef REPLAY_H
|
|
#define REPLAY_H
|
|
|
|
#include "khash.h"
|
|
#include "merge-ort.h"
|
|
#include "repository.h"
|
|
|
|
struct commit;
|
|
struct tree;
|
|
|
|
struct commit *replay_create_commit(struct repository *repo,
|
|
struct tree *tree,
|
|
struct commit *based_on,
|
|
struct commit *parent);
|
|
|
|
struct commit *replay_pick_regular_commit(struct repository *repo,
|
|
struct commit *pickme,
|
|
kh_oid_map_t *replayed_commits,
|
|
struct commit *onto,
|
|
struct merge_options *merge_opt,
|
|
struct merge_result *result);
|
|
|
|
#endif
|