summaryrefslogtreecommitdiff
path: root/merge-cache.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 08:29:13 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 08:29:13 -0700
commit800644c5cb3aad99a229a09112f42fa88b63c1c4 (patch)
tree8273c6e88004a86de60bca391f0891e46265e66f /merge-cache.c
parentfc4263ce4b6a613622dbe985a8e6aca015789cf1 (diff)
downloadgit-800644c5cb3aad99a229a09112f42fa88b63c1c4.tar.gz
git-rev-parse: parse ".." before simple SHA1's
This fixes "<hexsha1>..*", since get_sha1() will happily ignore any garbage at the end and thus we never got to the ".." check before.
Diffstat (limited to 'merge-cache.c')
0 files changed, 0 insertions, 0 deletions