Elijah Newren <[email protected]> writes:
> I would have used a Reported-by tag for Florian and Todd, but looking at
> the bugzilla.redhat.com bug report doesn't show me Florian's email
> address. I grepped through git logs and found two associated with that
> name, but didn't know if they were still accurate, or were a different
> Florian. So I just went with the sentence instead.
Or write names after reported-by without any address? There is no
law that says that a trailer's contents must be proper e-mail
addresses. People are already known to put garbage on Cc:, for
example.
> builtin/rev-parse.c | 8 ++++++--
> t/t6101-rev-parse-parents.sh | 8 ++++++++
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
> index a1e680b5e9..a0a0ace38d 100644
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -282,6 +282,10 @@ static int try_difference(const char *arg)
> struct commit *a, *b;
> a = lookup_commit_reference(&start_oid);
> b = lookup_commit_reference(&end_oid);
> + if (!a || !b) {
> + *dotdot = '.';
> + return 0;
> + }
We thought A..B or X...Y were a commit range, but it turns out that
it is not the case, since at least one end is not a committish. We
simply restore the original and tell "No, this is not a range, try
to parse it as something else" to the caller by returning 0.
Makes sense.
> @@ -328,12 +332,12 @@ static int try_parent_shorthands(const char *arg)
> return 0;
>
> *dotdot = 0;
> - if (get_oid_committish(arg, &oid)) {
> + if (get_oid_committish(arg, &oid) ||
> + !(commit = lookup_commit_reference(&oid))) {
> *dotdot = '^';
> return 0;
> }
>
> - commit = lookup_commit_reference(&oid);
OK, the logic flows the same way for things like foo^@ here, which
makes sense.
Looks good. Thanks.
