mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

43586: vcs_info git: Reformat to minimise next diff. No functional change.

Browse Source
This commit is contained in:
Daniel Shahaf 2018-10-02 15:20:52 +00:00
parent abc94e8f6a
commit a27fad1ae2
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2018-10-07 Daniel Shahaf <d.s@daniel.shahaf.name>
* 43586: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Reformat to minimise next diff. No functional
change.
* 43585: Functions/VCS_Info/Backends/VCS_INFO_get_data_svn:
vcs_info svn: Recognize working copies in need of an upgrade.

15
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View File

@ -191,8 +191,19 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
# pick/edit/fixup/squash/reword: Add "$hash $subject" to $git_patches_applied.
# exec: Add "exec ${command}" to $git_patches_applied.
# (anything else): As 'exec'.
p=${p/(#s)(p|pick|e|edit|r|reword|f|fixup|s|squash) /}
p=${p/(#s)x /exec }
case $p in
((p|pick|e|edit|r|reword|f|fixup|s|squash)' '*)
# The line is of the form "pick $hash $subject".
# Just strip the verb and we're good to go.
p=${p#* }
;;
(x *)
# The line is of the form 'exec foo bar baz' where 'foo bar
# baz' is a shell command. There's no way to map _that_ to
# "$hash $subject", but I hope this counts as making an effort.
p=${p/x /exec }
;;
esac
git_patches_applied+=("$p")
done
if [[ -f "${patchdir}/git-rebase-todo" ]] ; then