rebase: rename write_basic_state()
This clashes with a function in sequencer.c Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Apr 17, 2019 at 15:30 UTC
28dc09de6d9dbe8270c60177948e50a13c9933ab
1 file changed
+2
-2
builtin/rebase.c
+2
-2
@@ -245,7 +245,7 @@ static int read_basic_state(struct rebase_options *opts)
245
return 0;
246
}
247
248
-static int write_basic_state(struct rebase_options *opts)
248
+static int rebase_write_basic_state(struct rebase_options *opts)
249
{
250
write_file(state_dir_path("head-name", opts), "%s",
251
opts->head_name ? opts->head_name : "detached HEAD");
@@ -640,7 +640,7 @@ static int run_am(struct rebase_options *opts)
640
}
641
642
if (is_directory(opts->state_dir))
643
- write_basic_state(opts);
643
+ rebase_write_basic_state(opts);
644
645
return status;
646
}