| commit | 128fd54daeff23fbef0d0b7ec1a31f38d0803f63 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Tue, 7 May 2013 21:55:10 +0000 (7 16:55 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 May 2013 19:13:04 +0000 (8 12:13 -0700) | ||
| tree | f6d14c366f39a6f8255d2bcef5535eb8e8a91d5c | treesnapshot (tar.gz zip) |
| parent | e883a057a9da3c738dd6f6e2f1aa9498885ae1e8 | commitdiff |
sha1_name: reorganize get_sha1_basic()
Through the years the functionality to handle @{-N} and @{u} has moved
around the code, and as a result, code that once made sense, doesn't any
more.
There is no need to call this function recursively with the branch of
@{-N} substituted because dwim_{ref,log} already replaces it.
However, there's one corner-case where @{-N} resolves to a detached
HEAD, in which case we wouldn't get any ref back.
So we parse the nth-prior manually, and deal with it depending on
whether it's a SHA-1, or a ref.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Through the years the functionality to handle @{-N} and @{u} has moved
around the code, and as a result, code that once made sense, doesn't any
more.
There is no need to call this function recursively with the branch of
@{-N} substituted because dwim_{ref,log} already replaces it.
However, there's one corner-case where @{-N} resolves to a detached
HEAD, in which case we wouldn't get any ref back.
So we parse the nth-prior manually, and deal with it depending on
whether it's a SHA-1, or a ref.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sha1_name.c | diffblobblamehistory |