diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-20 10:33:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:10:47 (GMT) |
| commit | 5486ef0e6d159a8971742fd2464b9656f5457fda (patch) | |
| tree | 880293eb45e46f68b650a487cde1543ce8416865 | |
| parent | 8b3dce565084c89ceb19f7ccf0fe22ffd365f7fd (diff) | |
| download | git-5486ef0e6d159a8971742fd2464b9656f5457fda.zip git-5486ef0e6d159a8971742fd2464b9656f5457fda.tar.gz git-5486ef0e6d159a8971742fd2464b9656f5457fda.tar.bz2 | |
setup_revisions(): do not call get_pathspec() too early
This is necessary because we will later allow pathspecs to be fed from the
standard input, and pathspecs taken from the command line (and converted
via get_pathspec() already) in revs->prune_data too early gets in the way
when we want to append from the standard input.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1230,6 +1230,7 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def) { int i, flags, left, seen_dashdash, read_from_stdin; + const char **prune_data = NULL; /* First, search for "--" */ seen_dashdash = 0; @@ -1240,7 +1241,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch argv[i] = NULL; argc = i; if (argv[i + 1]) - revs->prune_data = get_pathspec(revs->prefix, argv + i + 1); + prune_data = argv + i + 1; seen_dashdash = 1; break; } @@ -1321,12 +1322,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch for (j = i; j < argc; j++) verify_filename(revs->prefix, argv[j]); - revs->prune_data = get_pathspec(revs->prefix, - argv + i); + prune_data = argv + i; break; } } + if (prune_data) + revs->prune_data = get_pathspec(revs->prefix, prune_data); + if (revs->def == NULL) revs->def = def; if (revs->show_merge) |