diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index eee973699..416953db4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ glob scanner needed some coaxing with counting matches with (Y) glob qualifier. +2014-06-02 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 32662: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Fix stagedstr for empty repos + 2014-06-01 Barton E. Schaefer <schaefer@zsh.org> * 32653: Completion/Unix/Command/_php: complete files with the diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index a48dc390d..76ab92f33 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -128,16 +128,22 @@ elif zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-staged-change querystaged=1 fi if (( querystaged || queryunstaged )) && \ - [[ "$(${vcs_comm[cmd]} rev-parse --is-inside-git-dir 2> /dev/null)" != 'true' ]] && \ - ${vcs_comm[cmd]} rev-parse --quiet --verify HEAD &> /dev/null ; then + [[ "$(${vcs_comm[cmd]} rev-parse --is-inside-work-tree 2> /dev/null)" == 'true' ]] ; then # Default: off - these are potentially expensive on big repositories if (( queryunstaged )) ; then ${vcs_comm[cmd]} diff --no-ext-diff --ignore-submodules --quiet --exit-code || gitunstaged=1 fi if (( querystaged )) ; then - ${vcs_comm[cmd]} diff-index --cached --quiet --ignore-submodules HEAD 2> /dev/null - (( $? && $? != 128 )) && gitstaged=1 + if ${vcs_comm[cmd]} rev-parse --quiet --verify HEAD &> /dev/null ; then + ${vcs_comm[cmd]} diff-index --cached --quiet --ignore-submodules HEAD 2> /dev/null + (( $? && $? != 128 )) && gitstaged=1 + else + # empty repository (no commits yet) + # 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is the git empty tree. + ${vcs_comm[cmd]} diff-index --cached --quiet --ignore-submodules 4b825dc642cb6eb9a060e54bf8d69288fbee4904 2>/dev/null + (( $? && $? != 128 )) && gitstaged=1 + fi fi fi |