Skip to content

Commit 28dc09d

Browse files
phillipwoodgitster
authored andcommitted
rebase: rename write_basic_state()
This clashes with a function in sequencer.c Signed-off-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 146839c commit 28dc09d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

builtin/rebase.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static int read_basic_state(struct rebase_options *opts)
245245
return 0;
246246
}
247247

248-
static int write_basic_state(struct rebase_options *opts)
248+
static int rebase_write_basic_state(struct rebase_options *opts)
249249
{
250250
write_file(state_dir_path("head-name", opts), "%s",
251251
opts->head_name ? opts->head_name : "detached HEAD");
@@ -640,7 +640,7 @@ static int run_am(struct rebase_options *opts)
640640
}
641641

642642
if (is_directory(opts->state_dir))
643-
write_basic_state(opts);
643+
rebase_write_basic_state(opts);
644644

645645
return status;
646646
}

0 commit comments

Comments
 (0)