diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2020-11-04 15:29:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-04 22:10:41 (GMT) |
| commit | a2bb10d06db8a90920f1f518705a0bb9d39aa1db (patch) | |
| tree | c1b76c4d2152805feda76957ee8c5dc892739bd4 /sequencer.h | |
| parent | f3e27a02d598084a0ef5c8dd6b410bd6a5c5299f (diff) | |
| download | git-a2bb10d06db8a90920f1f518705a0bb9d39aa1db.zip git-a2bb10d06db8a90920f1f518705a0bb9d39aa1db.tar.gz git-a2bb10d06db8a90920f1f518705a0bb9d39aa1db.tar.bz2 | |
rebase -i: use struct object_id when writing state
Rather than passing a string around pass the struct object_id that the
string was created from call oid_hex() when we write the file.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index ea56825..cf201f2 100644 --- a/sequencer.h +++ b/sequencer.h @@ -227,7 +227,7 @@ int read_author_script(const char *path, char **name, char **email, char **date, int allow_missing); void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); int write_basic_state(struct replay_opts *opts, const char *head_name, - struct commit *onto, const char *orig_head); + struct commit *onto, const struct object_id *orig_head); void sequencer_post_commit_cleanup(struct repository *r, int verbose); int sequencer_get_last_command(struct repository* r, enum replay_action *action); |