On Wed, Nov 14, 2012 at 09:01:48AM -0800, Jonathan Nieder wrote:
> > DESCRIPTION
> > -----------
> > -Prints a git logical variable.
> > +Prints one or more git logical variables, separated by newlines.
> > +
> > +Note that some variables may contain newlines themselves
>
> Maybe a -z option to NUL-terminate values would be useful some day.
Yeah, I thought about that but stopped short. The intended caller in my
series is Git.pm, whose command() splits on newlines. Although it is
perl...I suspect doing:
local $/ = "\0";
my @entries = command(...);
would work. For ident variables, we know they don't contain a newline,
though.
> > --- a/builtin/var.c
> > +++ b/builtin/var.c
> > @@ -73,8 +73,7 @@ static int show_config(const char *var, const char *value, void *cb)
> >
> > int cmd_var(int argc, const char **argv, const char *prefix)
> > {
> > - const char *val = NULL;
> > - if (argc != 2)
> > + if (argc < 2)
> > usage(var_usage);
> >
> > if (strcmp(argv[1], "-l") == 0) {
>
> What should happen if I pass "-l" followed by other arguments?
Good catch. Probably we should just call usage() once we see "-l"
and (argc > 2), which matches the previous behavior. I don't see much
point in listing specific variables after having listed them all.
I was also tempted to convert to parse_options, but I don't think that
really buys us anything (we could detect the option in "git var foo -l
bar", but since we are not going to do anything useful in such a case,
there is not much point).
> > + test_tick &&
> > + echo "A U Thor <author@xxxxxxxxxxx> 1112911993 -0700" >expect &&
>
> Do we need to hardcode the timestamp? Something like
>
> test_cmp_filtered () {
> expect=$1 actual=$2 &&
> sed -e 's/[0-9][0-9]* [-+][0-9][0-9][0-9][0-9]/TIMESTAMP" \
> <"$actual" >"$actual.filtered" &&
> test_cmp "$expect" "$actual.filtered"
> }
No, we don't have to. I was just hoping to keep the tests simple by not
doing any parsing trickery. The test_tick keeps it stable, but as you
note, it is not robust to reordering. I think it would be sufficient to
just put $GIT_COMMITTER_DATE into the expected output.
I'll fix both in a re-roll.
Thanks.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html