development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: rename write_basic_state()

Browse source 
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>
This commit is contained in:
Phillip Wood 2019-04-17 15:30:35 +01:00 committed by Junio C Hamano
parent 146839c4b6
commit 28dc09de6d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/rebase.c
View file

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