commit 28dc09de6d9dbe8270c60177948e50a13c9933ab
author Phillip Wood <phillip.wood@dunelm.org.uk> Wed Apr 17 15:30:35 2019 +0100
committer Junio C Hamano <gitster@pobox.com> Fri Apr 19 17:32:10 2019 +0900
tree f03312e0f31678050a1e31bdf7cf65414627fb29
parent 146839c4b69ec47a356eb1156f2093ac5cc2cb60

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>

builtin/rebase.c

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 239a54e..0b1a193 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -245,7 +245,7 @@ static int read_basic_state(struct rebase_options *opts)
 	return 0;
 }
 
-static int write_basic_state(struct rebase_options *opts)
+static int rebase_write_basic_state(struct rebase_options *opts)
 {
 	write_file(state_dir_path("head-name", opts), "%s",
 		   opts->head_name ? opts->head_name : "detached HEAD");
@@ -640,7 +640,7 @@ static int run_am(struct rebase_options *opts)
 	}
 
 	if (is_directory(opts->state_dir))
-		write_basic_state(opts);
+		rebase_write_basic_state(opts);
 
 	return status;
 }