diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:48 -0700 |
| commit | 8b6f6075befc935faa3330ee467e537694ac1d32 (patch) | |
| tree | d686d1da77d63df83acb6f5ac4bbea7cbd066a56 /revision.c | |
| parent | 0faaf7eafcd87c1e0b00e97018740153a048291a (diff) | |
| parent | a12cbe23ef765e89ba5b0872f6330a693ea391d2 (diff) | |
| download | git-8b6f6075befc935faa3330ee467e537694ac1d32.tar.gz | |
Merge branch 'jk/rev-list-stdin-noop-is-ok'
"git rev-list --stdin </dev/null" used to be an error; it now shows
no output without an error. "git rev-list --stdin --default HEAD"
still falls back to the given default when nothing is given on the
standard input.
* jk/rev-list-stdin-noop-is-ok:
rev-list: make empty --stdin not an error
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/revision.c b/revision.c index de4dce600d..46228f82ee 100644 --- a/revision.c +++ b/revision.c @@ -2318,7 +2318,7 @@ static void NORETURN diagnose_missing_default(const char *def) */ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt) { - int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt; + int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt; struct argv_array prune_data = ARGV_ARRAY_INIT; const char *submodule = NULL; @@ -2348,7 +2348,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s revarg_opt = opt ? opt->revarg_opt : 0; if (seen_dashdash) revarg_opt |= REVARG_CANNOT_BE_FILENAME; - read_from_stdin = 0; for (left = i = 1; i < argc; i++) { const char *arg = argv[i]; if (*arg == '-') { @@ -2367,7 +2366,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s argv[left++] = arg; continue; } - if (read_from_stdin++) + if (revs->read_from_stdin++) die("--stdin given twice?"); read_revisions_from_stdin(revs, &prune_data); continue; |