diff options
author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-10-07 17:46:42 +0000 |
---|---|---|
committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-10-08 13:41:45 +0000 |
commit | 31dcba76f07030f1a3c9f9ad6c41dbaf842eeb1a (patch) | |
tree | adab7e47abb2334f5274e44fbe9320ec88e768cc /ChangeLog | |
parent | 0e0219118d2df43ee52d44ef5ca93354597d5508 (diff) | |
download | zsh-31dcba76f07030f1a3c9f9ad6c41dbaf842eeb1a.tar.gz zsh-31dcba76f07030f1a3c9f9ad6c41dbaf842eeb1a.tar.xz zsh-31dcba76f07030f1a3c9f9ad6c41dbaf842eeb1a.zip |
43617: vcs_info git: During a non-interactive rebase of a detached head, computer the %b expando correctly.
Before this commit, the value of %b was the hash of the commit from the "source" side of the rebase, from .git/rebase-apply/orig-head and .git/rebase-apply/original-commit. This broke the invariant that %b expands to a git-rev-parse(1) expression resolving to what %r expands to. Use .git/rebase-apply/onto instead as, empirically, it contains the correct value.
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 27052b0cd..cd79613f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-10-08 Daniel Shahaf <d.s@daniel.shahaf.name> + * 43617: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: During a non-interactive rebase of a detached head, + computer the %b expando correctly. + * 43619: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: In non-interactive rebases, always set $hook_com[git_patches_applied] to a string of the form 'foo bar', |