rebase -i: use struct object_id when writing state

phillipwood · gitster · commit a2bb10d06db8 · 2020-11-04T14:10:41.000-08:00
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 &lt;phillip.wood@dunelm.org.uk&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/rebase.c b/builtin/rebase.c
@@ -296,7 +296,8 @@ static int get_revision_ranges(struct commit *upstream, struct commit *onto,
 }
 
 static int init_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)
 {
 	FILE *interactive;
 
@@ -340,7 +341,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 
 	if (init_basic_state(&replay,
 			     opts->head_name ? opts->head_name : "detached HEAD",
-			     opts->onto, head_hash)) {
+			     opts->onto, &opts->orig_head)) {
 		free(revisions);
 		free(shortrevisions);
 
diff --git a/sequencer.c b/sequencer.c
@@ -2692,15 +2692,16 @@ static void write_strategy_opts(struct replay_opts *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)
 {
 	if (head_name)
 		write_file(rebase_path_head_name(), "%s\n", head_name);
 	if (onto)
 		write_file(rebase_path_onto(), "%s\n",
 			   oid_to_hex(&onto->object.oid));
 	if (orig_head)
-		write_file(rebase_path_orig_head(), "%s\n", orig_head);
+		write_file(rebase_path_orig_head(), "%s\n",
+			   oid_to_hex(orig_head));
 
 	if (opts->quiet)
 		write_file(rebase_path_quiet(), "%s", "");
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,8 @@ static int get_revision_ranges(struct commit upstream, struct commit onto,`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`static int init_basic_state(struct replay_opts opts, const char head_name,`
`299`		`- struct commit onto, const char orig_head)`
	`299`	`+ struct commit *onto,`
	`300`	`+ const struct object_id *orig_head)`
`300`	`301`	`{`
`301`	`302`	`FILE *interactive;`
`302`	`303`
`@@ -340,7 +341,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)`
`340`	`341`
`341`	`342`	`if (init_basic_state(&replay,`
`342`	`343`	`opts->head_name ? opts->head_name : "detached HEAD",`
`343`		`- opts->onto, head_hash)) {`
	`344`	`+ opts->onto, &opts->orig_head)) {`
`344`	`345`	`free(revisions);`
`345`	`346`	`free(shortrevisions);`
`346`	`347`