diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-07 16:55:10 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-08 12:13:04 -0700 |
| commit | 128fd54daeff23fbef0d0b7ec1a31f38d0803f63 (patch) | |
| tree | f6d14c366f39a6f8255d2bcef5535eb8e8a91d5c /Documentation/git-apply.txt | |
| parent | sha1_name: don't waste cycles in the @-parsing loop (diff) | |
| download | tgif-128fd54daeff23fbef0d0b7ec1a31f38d0803f63.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-apply.txt')
0 files changed, 0 insertions, 0 deletions