@@ -2195,39 +2195,6 @@ static void read_pathspec_from_stdin(struct strbuf *sb,
2195
2195
strvec_push (prune , sb -> buf );
2196
2196
}
2197
2197
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
-
2231
2198
static void add_grep (struct rev_info * revs , const char * ptn , enum grep_pat_token what )
2232
2199
{
2233
2200
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,
2816
2783
return 1 ;
2817
2784
}
2818
2785
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
+
2819
2819
static void NORETURN diagnose_missing_default (const char * def )
2820
2820
{
2821
2821
int flags ;
0 commit comments