Skip to content

Commit

Permalink
revision: reorder read_revisions_from_stdin()
Browse files Browse the repository at this point in the history
Reorder `read_revisions_from_stdin()` so that we can start using
`handle_revision_pseudo_opt()` without a forward declaration in a
subsequent commit.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
pks-t authored and gitster committed Jun 15, 2023
1 parent d7d8841 commit cc80450
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -2195,39 +2195,6 @@ static void read_pathspec_from_stdin(struct strbuf *sb,
strvec_push(prune, sb->buf);
}

static void read_revisions_from_stdin(struct rev_info *revs,
struct strvec *prune)
{
struct strbuf sb;
int seen_dashdash = 0;
int save_warning;

save_warning = warn_on_object_refname_ambiguity;
warn_on_object_refname_ambiguity = 0;

strbuf_init(&sb, 1000);
while (strbuf_getline(&sb, stdin) != EOF) {
int len = sb.len;
if (!len)
break;
if (sb.buf[0] == '-') {
if (len == 2 && sb.buf[1] == '-') {
seen_dashdash = 1;
break;
}
die("options not supported in --stdin mode");
}
if (handle_revision_arg(sb.buf, revs, 0,
REVARG_CANNOT_BE_FILENAME))
die("bad revision '%s'", sb.buf);
}
if (seen_dashdash)
read_pathspec_from_stdin(&sb, prune);

strbuf_release(&sb);
warn_on_object_refname_ambiguity = save_warning;
}

static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
{
append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
Expand Down Expand Up @@ -2816,6 +2783,39 @@ static int handle_revision_pseudo_opt(struct rev_info *revs,
return 1;
}

static void read_revisions_from_stdin(struct rev_info *revs,
struct strvec *prune)
{
struct strbuf sb;
int seen_dashdash = 0;
int save_warning;

save_warning = warn_on_object_refname_ambiguity;
warn_on_object_refname_ambiguity = 0;

strbuf_init(&sb, 1000);
while (strbuf_getline(&sb, stdin) != EOF) {
int len = sb.len;
if (!len)
break;
if (sb.buf[0] == '-') {
if (len == 2 && sb.buf[1] == '-') {
seen_dashdash = 1;
break;
}
die("options not supported in --stdin mode");
}
if (handle_revision_arg(sb.buf, revs, 0,
REVARG_CANNOT_BE_FILENAME))
die("bad revision '%s'", sb.buf);
}
if (seen_dashdash)
read_pathspec_from_stdin(&sb, prune);

strbuf_release(&sb);
warn_on_object_refname_ambiguity = save_warning;
}

static void NORETURN diagnose_missing_default(const char *def)
{
int flags;
Expand Down

0 comments on commit cc80450

Please sign in to comment.