diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-12-09 19:41:19 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-12-13 15:28:00 +0000 |
| commit | 23154e46e6864f35c1fc2e052c4ea14fb42014fb (patch) | |
| tree | e3cad0085ea90d9f0f4345702fce0241bf73af1e /ChangeLog | |
| parent | 90b2654b7e6c459963f3445334299138d2633f96 (diff) | |
| download | zsh-23154e46e6864f35c1fc2e052c4ea14fb42014fb.tar.gz zsh-23154e46e6864f35c1fc2e052c4ea14fb42014fb.tar.xz zsh-23154e46e6864f35c1fc2e052c4ea14fb42014fb.zip | |
43879: vcs_info git: Fix fatal error in VCS_INFO_git_getbranch in corner case
Before this commit, the following use-case:
git checkout foo^
git show foo | git am
would result in a fatal error, with vcs_info_msg_N_ not set:
VCS_INFO_git_getbranch:18: no such file or directory: .git/rebase-apply/onto
Now they are set correctly, and HEAD's commit hash is used.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 129a38e80..e2508d6d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-12-13 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 43879: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Fix fatal error in VCS_INFO_git_getbranch in + corner case + 2018-12-09 dana <dana@dana.is> * 43871: Completion/Unix/Type/_files: Support `-F '(pat ...)'` as |