1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00

43588: vcs_info git: Make sure applied-patches is of the form "$hash $subject" --- that is, has a space and a non-empty second argument --- even with future 'git rebase -i' verbs.

Use of '?' is consistent with these precedents:

Backends/VCS_INFO_get_data_git:220:            printf -v "git_patches_applied[$p]"  "%04d ?" "$p"
Backends/VCS_INFO_get_data_git:242:                git_patches_applied+=("? $subject")
Backends/VCS_INFO_get_data_git:244:                git_patches_applied+=("?")
VCS_INFO_quilt:160:            applied[$i]+=" ?"
VCS_INFO_quilt:168:            unapplied[$i]+=" ?"
This commit is contained in:
Daniel Shahaf 2018-10-02 15:20:53 +00:00
parent a27fad1ae2
commit 0c00eed4c7
2 changed files with 10 additions and 0 deletions

View file

@ -203,6 +203,11 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
# "$hash $subject", but I hope this counts as making an effort.
p=${p/x /exec }
;;
(*)
# Forward compatibility with not-yet-existing 'git rebase -i' verbs.
if [[ $p != *\ * ]]; then
p+=" ?"
fi
esac
git_patches_applied+=("$p")
done