[Annoyance] "git log .." thinks ".." is ambiguous
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 2, 2011, 19:15 UTC
- Message-ID
- <7vr58glxro.fsf@alter.siamese.dyndns.org>
Either end of revision range operator can be omitted to default to HEAD, as in "origin.." (what did I do since I forked) or "..origin" (what did they do since I forked). But this resulted in ".." to be interpreted as an empty range "HEAD..HEAD", and worse yet, because ".." does exist on the filesystem, we get this annoying output:
$ cd Documentation/howto $ git log .. ;# give me recent commits that touch Documentation/ area. fatal: ambiguous argument '..': both revision and filename Use '--' to separate filenames from revisions
Surely we could say "git log .. --", but we shouldn't have to.
--- * I don't have very strong feeling about this, but just got annoyed enough to write this patch. Should apply cleanly all the way down to at least 1.6.0 if not earlier.
revision.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/revision.c b/revision.c index f4b8b38..26271d1 100644 --- a/revision.c +++ b/revision.c @@ -905,14 +905,26 @@ int handle_revision_arg(const char *arg, struct rev_info *revs, const char *this = arg; int symmetric = *next == '.'; unsigned int flags_exclude = flags ^ UNINTERESTING; + static const char head_by_default[] = "HEAD"; *dotdot = 0; next += symmetric; if (!*next) - next = "HEAD"; + next = head_by_default; if (dotdot == arg) - this = "HEAD"; + this = head_by_default; + if (this == head_by_default && next == head_by_default && + !symmetric) { + /* + * Just ".."? That is not a range but the + * pathspec for the parent directory. + */ + if (!cant_be_filename) { + *dotdot = '.'; + return -1; + } + } if (!get_sha1(this, from_sha1) && !get_sha1(next, sha1)) { struct commit *a, *b;