From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Wed, 17 Apr 2019 14:30:35 +0000 (+0100)
Subject: rebase: rename write_basic_state()
X-Git-Tag: v2.22.0-rc0~4^2~9
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=28dc09de6d9dbe8270c60177948e50a13c9933ab;p=git.git

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>
---

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;
 }