kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sequencer: avoid unnecessary indirection 

We really do not need the *pointer to a* pointer to the options in
the read_populate_opts() function.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2016-10-14 15:17:16 +02:00 committed by Junio C Hamano
parent 8a2a0f5341
commit 5adf9bdc1b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sequencer.c
View File

@ -813,7 +813,7 @@ static int populate_opts_cb(const char *key, const char *value, void *data)
return 0; return 0;
} }


static int read_populate_opts(struct replay_opts **opts) static int read_populate_opts(struct replay_opts *opts)
{ {
if (!file_exists(git_path_opts_file())) if (!file_exists(git_path_opts_file()))
return 0; return 0;
@ -823,7 +823,7 @@ static int read_populate_opts(struct replay_opts **opts)
* about this case, though, because we wrote that file ourselves, so we * about this case, though, because we wrote that file ourselves, so we
* are pretty certain that it is syntactically correct. * are pretty certain that it is syntactically correct.
*/ */
if (git_config_from_file(populate_opts_cb, git_path_opts_file(), *opts) < 0) if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0)
return error(_("Malformed options sheet: %s"), return error(_("Malformed options sheet: %s"),
git_path_opts_file()); git_path_opts_file());
return 0; return 0;
@ -1054,7 +1054,7 @@ static int sequencer_continue(struct replay_opts *opts)


if (!file_exists(git_path_todo_file())) if (!file_exists(git_path_todo_file()))
return continue_single_pick(); return continue_single_pick();
if (read_populate_opts(&opts) || if (read_populate_opts(opts) ||
read_populate_todo(&todo_list, opts)) read_populate_todo(&todo_list, opts))
return -1; return -1;