diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-17 15:30:35 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-19 17:32:10 +0900 |
| commit | 28dc09de6d9dbe8270c60177948e50a13c9933ab (patch) | |
| tree | f03312e0f31678050a1e31bdf7cf65414627fb29 /builtin/rebase.c | |
| parent | rebase: don't translate trace strings (diff) | |
| download | tgif-28dc09de6d9dbe8270c60177948e50a13c9933ab.tar.xz | |
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>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |