[v1,03/12] rebase: rename write_basic_state()
diff mbox series

Message ID 20190417143044.17655-4-phillip.wood123@gmail.com
State New
Headers show
Series
  • Run rebase -i without forking rebase--interactive
Related show

Commit Message

Phillip Wood April 17, 2019, 2:30 p.m. UTC
From: Phillip Wood <phillip.wood@dunelm.org.uk>

This clashes with a function in sequencer.c

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
 builtin/rebase.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox series

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 239a54ecfe..0b1a193a8e 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;
 }