diff options
author | Santi Béjar <santi@agolina.net> | 2010-12-06 11:20:11 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-06 16:57:48 -0800 |
commit | f864f2615b76e5d74518c482ceeef3a2589017fe (patch) | |
tree | 75e63ae646daf844f2adf7c6bf8ad611b0a1e554 /builtin | |
parent | Merge branch 'jn/ignore-doc' (diff) | |
download | tgif-f864f2615b76e5d74518c482ceeef3a2589017fe.tar.xz |
parse-remote: handle detached HEAD
get_remote_merge_branch with zero or one arguments returns the
upstream branch. But a detached HEAD does no have an upstream branch,
as it is not tracking anything. Handle this case testing the exit code
of "git symbolic-ref -q HEAD".
Reported-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Santi Béjar <santi@agolina.net>
Tested-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions