]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 42cab60) | patch
fix parsing of @{-1}@{u} combination
authorJeff King <peff@peff.net>
Thu, 28 Jan 2010 09:52:22 +0000 (04:52 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jan 2010 20:12:42 +0000 (12:12 -0800)
commitd46a8301930ae83de30fbbbbce1bb02a98745204
treed58efd6ccd18ee97fc9e518c3d348f6920f0d901tree | snapshot
parent42cab601cfd0364c57434f90c6ba66a1ccb179eccommit | diff
fix parsing of @{-1}@{u} combination

Previously interpret_branch_name would see @{-1} and stop
parsing, leaving the @{u} as cruft that provoked an error.
Instead, we should recurse if there is more to parse.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sha1_name.c diff | blob | blame | history
t/t1508-at-combinations.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.