From 4cfbbf9ca5f1f7f6e79681fbad43daf674157727 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 18 Aug 2018 15:37:44 +0000 Subject: 43314: vcs_info git: Flatten a nested if. No functional change. --- ChangeLog | 5 +++++ Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 495c54c4d..c69774286 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-08-24 Daniel Shahaf + + * 43314: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Flatten a nested if. + 2018-08-24 Oliver Kiddle * 43330: Completion/BSD/Command/_cu: complete more options diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index f3dd95dcb..a44a62c79 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -104,16 +104,11 @@ VCS_INFO_git_getbranch () { elif [[ -d "${gitdir}/.dotest-merge" ]] ; then gitbranch="$(< ${gitdir}/.dotest-merge/head-name)" + elif gitbranch="$(${(z)gitsymref} 2> /dev/null)" ; then + elif gitbranch="refs/tags/$(${vcs_comm[cmd]} describe --all --exact-match HEAD 2>/dev/null)" ; then + elif gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..." ; then else - gitbranch="$(${(z)gitsymref} 2> /dev/null)" - - if [[ $? -ne 0 ]] ; then - gitbranch="refs/tags/$(${vcs_comm[cmd]} describe --all --exact-match HEAD 2>/dev/null)" - - if [[ $? -ne 0 ]] ; then - gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..." - fi - fi + # Can't happen fi return 0 -- cgit 1.4.1