mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'jc/maint-pathspec-stdin-and-cmdline'
* jc/maint-pathspec-stdin-and-cmdline: setup_revisions(): take pathspec from command line and --stdin correctly Conflicts: revision.c
This commit is contained in:
commit
e2e4aed5de
80
revision.c
80
revision.c
|
@ -1098,35 +1098,34 @@ int handle_revision_arg(const char *arg, struct rev_info *revs,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb, const char ***prune_data)
|
struct cmdline_pathspec {
|
||||||
|
int alloc;
|
||||||
|
int nr;
|
||||||
|
const char **path;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
|
||||||
{
|
{
|
||||||
const char **prune = *prune_data;
|
while (*av) {
|
||||||
int prune_nr;
|
ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
|
||||||
int prune_alloc;
|
prune->path[prune->nr++] = *(av++);
|
||||||
|
}
|
||||||
/* count existing ones */
|
}
|
||||||
if (!prune)
|
|
||||||
prune_nr = 0;
|
|
||||||
else
|
|
||||||
for (prune_nr = 0; prune[prune_nr]; prune_nr++)
|
|
||||||
;
|
|
||||||
prune_alloc = prune_nr; /* not really, but we do not know */
|
|
||||||
|
|
||||||
|
static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
|
||||||
|
struct cmdline_pathspec *prune)
|
||||||
|
{
|
||||||
while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
|
while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
|
||||||
int len = sb->len;
|
int len = sb->len;
|
||||||
if (len && sb->buf[len - 1] == '\n')
|
if (len && sb->buf[len - 1] == '\n')
|
||||||
sb->buf[--len] = '\0';
|
sb->buf[--len] = '\0';
|
||||||
ALLOC_GROW(prune, prune_nr+1, prune_alloc);
|
ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
|
||||||
prune[prune_nr++] = xstrdup(sb->buf);
|
prune->path[prune->nr++] = xstrdup(sb->buf);
|
||||||
}
|
}
|
||||||
if (prune) {
|
|
||||||
ALLOC_GROW(prune, prune_nr+1, prune_alloc);
|
|
||||||
prune[prune_nr] = NULL;
|
|
||||||
}
|
|
||||||
*prune_data = prune;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void read_revisions_from_stdin(struct rev_info *revs, const char ***prune)
|
static void read_revisions_from_stdin(struct rev_info *revs,
|
||||||
|
struct cmdline_pathspec *prune)
|
||||||
{
|
{
|
||||||
struct strbuf sb;
|
struct strbuf sb;
|
||||||
int seen_dashdash = 0;
|
int seen_dashdash = 0;
|
||||||
|
@ -1509,34 +1508,6 @@ static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void
|
||||||
return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
|
return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void append_prune_data(const char ***prune_data, const char **av)
|
|
||||||
{
|
|
||||||
const char **prune = *prune_data;
|
|
||||||
int prune_nr;
|
|
||||||
int prune_alloc;
|
|
||||||
|
|
||||||
if (!prune) {
|
|
||||||
*prune_data = av;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* count existing ones */
|
|
||||||
for (prune_nr = 0; prune[prune_nr]; prune_nr++)
|
|
||||||
;
|
|
||||||
prune_alloc = prune_nr; /* not really, but we do not know */
|
|
||||||
|
|
||||||
while (*av) {
|
|
||||||
ALLOC_GROW(prune, prune_nr+1, prune_alloc);
|
|
||||||
prune[prune_nr++] = *av;
|
|
||||||
av++;
|
|
||||||
}
|
|
||||||
if (prune) {
|
|
||||||
ALLOC_GROW(prune, prune_nr+1, prune_alloc);
|
|
||||||
prune[prune_nr] = NULL;
|
|
||||||
}
|
|
||||||
*prune_data = prune;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int handle_revision_pseudo_opt(const char *submodule,
|
static int handle_revision_pseudo_opt(const char *submodule,
|
||||||
struct rev_info *revs,
|
struct rev_info *revs,
|
||||||
int argc, const char **argv, int *flags)
|
int argc, const char **argv, int *flags)
|
||||||
|
@ -1610,9 +1581,10 @@ static int handle_revision_pseudo_opt(const char *submodule,
|
||||||
int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
|
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;
|
int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
|
||||||
const char **prune_data = NULL;
|
struct cmdline_pathspec prune_data;
|
||||||
const char *submodule = NULL;
|
const char *submodule = NULL;
|
||||||
|
|
||||||
|
memset(&prune_data, 0, sizeof(prune_data));
|
||||||
if (opt)
|
if (opt)
|
||||||
submodule = opt->submodule;
|
submodule = opt->submodule;
|
||||||
|
|
||||||
|
@ -1625,7 +1597,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
||||||
argv[i] = NULL;
|
argv[i] = NULL;
|
||||||
argc = i;
|
argc = i;
|
||||||
if (argv[i + 1])
|
if (argv[i + 1])
|
||||||
prune_data = argv + i + 1;
|
append_prune_data(&prune_data, argv + i + 1);
|
||||||
seen_dashdash = 1;
|
seen_dashdash = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1688,8 +1660,12 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
||||||
got_rev_arg = 1;
|
got_rev_arg = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prune_data)
|
if (prune_data.nr) {
|
||||||
init_pathspec(&revs->prune_data, get_pathspec(revs->prefix, prune_data));
|
ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
|
||||||
|
prune_data.path[prune_data.nr++] = NULL;
|
||||||
|
init_pathspec(&revs->prune_data,
|
||||||
|
get_pathspec(revs->prefix, prune_data.path));
|
||||||
|
}
|
||||||
|
|
||||||
if (revs->def == NULL)
|
if (revs->def == NULL)
|
||||||
revs->def = opt ? opt->def : NULL;
|
revs->def = opt ? opt->def : NULL;
|
||||||
|
|
|
@ -58,4 +58,21 @@ check side-3 ^side-4 -- file-3
|
||||||
check side-3 ^side-2
|
check side-3 ^side-2
|
||||||
check side-3 ^side-2 -- file-1
|
check side-3 ^side-2 -- file-1
|
||||||
|
|
||||||
|
test_expect_success 'not only --stdin' '
|
||||||
|
cat >expect <<-EOF &&
|
||||||
|
7
|
||||||
|
|
||||||
|
file-1
|
||||||
|
file-2
|
||||||
|
EOF
|
||||||
|
cat >input <<-EOF &&
|
||||||
|
^master^
|
||||||
|
--
|
||||||
|
file-2
|
||||||
|
EOF
|
||||||
|
git log --pretty=tformat:%s --name-only --stdin master -- file-1 \
|
||||||
|
<input >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue