Skip to content

Commit cc80450

Browse files
pks-tgitster
authored andcommitted
revision: reorder read_revisions_from_stdin()
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d7d8841 commit cc80450

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

revision.c

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,39 +2195,6 @@ static void read_pathspec_from_stdin(struct strbuf *sb,
21952195
strvec_push(prune, sb->buf);
21962196
}
21972197

2198-
static void read_revisions_from_stdin(struct rev_info *revs,
2199-
struct strvec *prune)
2200-
{
2201-
struct strbuf sb;
2202-
int seen_dashdash = 0;
2203-
int save_warning;
2204-
2205-
save_warning = warn_on_object_refname_ambiguity;
2206-
warn_on_object_refname_ambiguity = 0;
2207-
2208-
strbuf_init(&sb, 1000);
2209-
while (strbuf_getline(&sb, stdin) != EOF) {
2210-
int len = sb.len;
2211-
if (!len)
2212-
break;
2213-
if (sb.buf[0] == '-') {
2214-
if (len == 2 && sb.buf[1] == '-') {
2215-
seen_dashdash = 1;
2216-
break;
2217-
}
2218-
die("options not supported in --stdin mode");
2219-
}
2220-
if (handle_revision_arg(sb.buf, revs, 0,
2221-
REVARG_CANNOT_BE_FILENAME))
2222-
die("bad revision '%s'", sb.buf);
2223-
}
2224-
if (seen_dashdash)
2225-
read_pathspec_from_stdin(&sb, prune);
2226-
2227-
strbuf_release(&sb);
2228-
warn_on_object_refname_ambiguity = save_warning;
2229-
}
2230-
22312198
static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
22322199
{
22332200
append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
@@ -2816,6 +2783,39 @@ static int handle_revision_pseudo_opt(struct rev_info *revs,
28162783
return 1;
28172784
}
28182785

2786+
static void read_revisions_from_stdin(struct rev_info *revs,
2787+
struct strvec *prune)
2788+
{
2789+
struct strbuf sb;
2790+
int seen_dashdash = 0;
2791+
int save_warning;
2792+
2793+
save_warning = warn_on_object_refname_ambiguity;
2794+
warn_on_object_refname_ambiguity = 0;
2795+
2796+
strbuf_init(&sb, 1000);
2797+
while (strbuf_getline(&sb, stdin) != EOF) {
2798+
int len = sb.len;
2799+
if (!len)
2800+
break;
2801+
if (sb.buf[0] == '-') {
2802+
if (len == 2 && sb.buf[1] == '-') {
2803+
seen_dashdash = 1;
2804+
break;
2805+
}
2806+
die("options not supported in --stdin mode");
2807+
}
2808+
if (handle_revision_arg(sb.buf, revs, 0,
2809+
REVARG_CANNOT_BE_FILENAME))
2810+
die("bad revision '%s'", sb.buf);
2811+
}
2812+
if (seen_dashdash)
2813+
read_pathspec_from_stdin(&sb, prune);
2814+
2815+
strbuf_release(&sb);
2816+
warn_on_object_refname_ambiguity = save_warning;
2817+
}
2818+
28192819
static void NORETURN diagnose_missing_default(const char *def)
28202820
{
28212821
int flags;

0 commit comments

Comments
 (0)