diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-02 13:39:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-23 14:37:49 -0700 |
| commit | 003c84f6d2b9e9c4d5bbf5262cae994bac7190cb (patch) | |
| tree | 90c8c22f9d376aa92f46d42f7f4b9d74017ce9b9 /revision.c | |
| parent | c142616fb2152d7887f9c38ff20e07167d31b0c8 (diff) | |
| download | git-003c84f6d2b9e9c4d5bbf5262cae994bac7190cb.tar.gz | |
specifying ranges: we did not mean to make ".." an empty set
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 the current parser interprets ".." 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 ../" or even "git log -- .." to disambiguate,
but we shouldn't have to.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 5b81a92e3a..457868d647 100644 --- a/revision.c +++ b/revision.c @@ -1132,15 +1132,27 @@ 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"; unsigned int a_flags; *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; |