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>

diff --git a/revision.c b/revision.c
index f5b735fc1416917f4bae0701344f96ba12d723f8..4410a45a023f61774652420a7b8d430fd34a3ea8 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -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;
 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;
 
        /* 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])
                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;
        }
                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]);
 
                        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;
                }
        }
 
                        break;
                }
        }
 

+       if (prune_data)
+               revs->prune_data = get_pathspec(revs->prefix, prune_data);
+

        if (revs->def == NULL)
                revs->def = def;
        if (revs->show_merge)
        if (revs->def == NULL)
                revs->def = def;
        if (revs->show_merge)