mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
rebase: use read_oneliner()
Since in sequencer.c, read_one() basically duplicates the functionality of read_oneliner(), reduce code duplication by replacing read_one() with read_oneliner(). This was done with the following Coccinelle script @@ expression a, b; @@ - read_one(a, b) + !read_oneliner(b, a, READ_ONELINER_WARN_MISSING) and long lines were manually broken up. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c20de8bec6
commit
efcf6cf049
|
@ -586,15 +586,6 @@ static const char *state_dir_path(const char *filename, struct rebase_options *o
|
|||
return path.buf;
|
||||
}
|
||||
|
||||
/* Read one file, then strip line endings */
|
||||
static int read_one(const char *path, struct strbuf *buf)
|
||||
{
|
||||
if (strbuf_read_file(buf, path, 0) < 0)
|
||||
return error_errno(_("could not read '%s'"), path);
|
||||
strbuf_trim_trailing_newline(buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Initialize the rebase options from the state directory. */
|
||||
static int read_basic_state(struct rebase_options *opts)
|
||||
{
|
||||
|
@ -602,8 +593,10 @@ static int read_basic_state(struct rebase_options *opts)
|
|||
struct strbuf buf = STRBUF_INIT;
|
||||
struct object_id oid;
|
||||
|
||||
if (read_one(state_dir_path("head-name", opts), &head_name) ||
|
||||
read_one(state_dir_path("onto", opts), &buf))
|
||||
if (!read_oneliner(&head_name, state_dir_path("head-name", opts),
|
||||
READ_ONELINER_WARN_MISSING) ||
|
||||
!read_oneliner(&buf, state_dir_path("onto", opts),
|
||||
READ_ONELINER_WARN_MISSING))
|
||||
return -1;
|
||||
opts->head_name = starts_with(head_name.buf, "refs/") ?
|
||||
xstrdup(head_name.buf) : NULL;
|
||||
|
@ -619,9 +612,11 @@ static int read_basic_state(struct rebase_options *opts)
|
|||
*/
|
||||
strbuf_reset(&buf);
|
||||
if (file_exists(state_dir_path("orig-head", opts))) {
|
||||
if (read_one(state_dir_path("orig-head", opts), &buf))
|
||||
if (!read_oneliner(&buf, state_dir_path("orig-head", opts),
|
||||
READ_ONELINER_WARN_MISSING))
|
||||
return -1;
|
||||
} else if (read_one(state_dir_path("head", opts), &buf))
|
||||
} else if (!read_oneliner(&buf, state_dir_path("head", opts),
|
||||
READ_ONELINER_WARN_MISSING))
|
||||
return -1;
|
||||
if (get_oid(buf.buf, &opts->orig_head))
|
||||
return error(_("invalid orig-head: '%s'"), buf.buf);
|
||||
|
@ -641,8 +636,8 @@ static int read_basic_state(struct rebase_options *opts)
|
|||
|
||||
if (file_exists(state_dir_path("allow_rerere_autoupdate", opts))) {
|
||||
strbuf_reset(&buf);
|
||||
if (read_one(state_dir_path("allow_rerere_autoupdate", opts),
|
||||
&buf))
|
||||
if (!read_oneliner(&buf, state_dir_path("allow_rerere_autoupdate", opts),
|
||||
READ_ONELINER_WARN_MISSING))
|
||||
return -1;
|
||||
if (!strcmp(buf.buf, "--rerere-autoupdate"))
|
||||
opts->allow_rerere_autoupdate = RERERE_AUTOUPDATE;
|
||||
|
@ -655,8 +650,8 @@ static int read_basic_state(struct rebase_options *opts)
|
|||
|
||||
if (file_exists(state_dir_path("gpg_sign_opt", opts))) {
|
||||
strbuf_reset(&buf);
|
||||
if (read_one(state_dir_path("gpg_sign_opt", opts),
|
||||
&buf))
|
||||
if (!read_oneliner(&buf, state_dir_path("gpg_sign_opt", opts),
|
||||
READ_ONELINER_WARN_MISSING))
|
||||
return -1;
|
||||
free(opts->gpg_sign_opt);
|
||||
opts->gpg_sign_opt = xstrdup(buf.buf);
|
||||
|
@ -664,7 +659,8 @@ static int read_basic_state(struct rebase_options *opts)
|
|||
|
||||
if (file_exists(state_dir_path("strategy", opts))) {
|
||||
strbuf_reset(&buf);
|
||||
if (read_one(state_dir_path("strategy", opts), &buf))
|
||||
if (!read_oneliner(&buf, state_dir_path("strategy", opts),
|
||||
READ_ONELINER_WARN_MISSING))
|
||||
return -1;
|
||||
free(opts->strategy);
|
||||
opts->strategy = xstrdup(buf.buf);
|
||||
|
@ -672,7 +668,8 @@ static int read_basic_state(struct rebase_options *opts)
|
|||
|
||||
if (file_exists(state_dir_path("strategy_opts", opts))) {
|
||||
strbuf_reset(&buf);
|
||||
if (read_one(state_dir_path("strategy_opts", opts), &buf))
|
||||
if (!read_oneliner(&buf, state_dir_path("strategy_opts", opts),
|
||||
READ_ONELINER_WARN_MISSING))
|
||||
return -1;
|
||||
free(opts->strategy_opts);
|
||||
opts->strategy_opts = xstrdup(buf.buf);
|
||||
|
@ -724,7 +721,7 @@ static int apply_autostash(struct rebase_options *opts)
|
|||
if (!file_exists(path))
|
||||
return 0;
|
||||
|
||||
if (read_one(path, &autostash))
|
||||
if (!read_oneliner(&autostash, path, READ_ONELINER_WARN_MISSING))
|
||||
return error(_("Could not read '%s'"), path);
|
||||
/* Ensure that the hash is not mistaken for a number */
|
||||
strbuf_addstr(&autostash, "^0");
|
||||
|
|
Loading…
Reference in a new issue