diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-01-21 20:00:48 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-21 16:57:24 -0800 |
commit | 4db86e8b6e8002b3113341ad742bf2fd94d4df50 (patch) | |
tree | 0eb5b1c2082f9ba46756bb6cb9b26efe588dfd98 /xdiff | |
parent | Update draft release notes to 1.8.2 (diff) | |
download | tgif-4db86e8b6e8002b3113341ad742bf2fd94d4df50.tar.xz |
Update :/abc ambiguity check
:/abc may mean two things:
- as a revision, it means the revision that has "abc" in commit
message.
- as a pathpec, it means "abc" from root.
Currently we see ":/abc" as a rev (most of the time), but never see it
as a pathspec even if "abc" exists and "git log :/abc" will gladly
take ":/abc" as rev even it's ambiguous. This patch makes it:
- ambiguous when "abc" exists on worktree
- a rev if abc does not exist on worktree
- a path if abc is not found in any commits (although better use
"--" to avoid ambiguation because searching through commit DAG is
expensive)
A plus from this patch is, because ":/" never matches anything as a
rev, it is never considered a valid rev and because root directory
always exists, ":/" is always unambiguously seen as a pathspec.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions