diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2014-05-30 23:50:55 +0000 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2014-06-02 15:17:04 +0200 |
| commit | b85b09b78b52b07cf0b83ae7892676327828a37f (patch) | |
| tree | 7e6999fb44692d379e2c1aa256c184b676ce0bf1 | |
| parent | f5ad1ccbd6dc6230f0344635791db3fd11966a3a (diff) | |
| download | zsh-b85b09b78b52b07cf0b83ae7892676327828a37f.tar.gz zsh-b85b09b78b52b07cf0b83ae7892676327828a37f.tar.xz zsh-b85b09b78b52b07cf0b83ae7892676327828a37f.zip | |
32662: vcs_info git: Fix stagedstr for empty repos
In empty repositories, HEAD is an unresolvable symbolic ref. Start computing stagedstr/unstagedstr in that case; for the former, use a different method than the non-empty-repository case.
| -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 cf25fda8f..688e2727a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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 |