summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorMarc Finet <m.dreadlock@gmail.com>2014-10-09 00:24:45 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2014-10-09 18:11:08 +0200
commit0f73b35f4e0d8adad216ee6650bfef4622df43b1 (patch)
treea311604f640fd35d81689421e2fe4da0f0a4dd83 /ChangeLog
parentUpdate version number to 5.0.7-dev-0 to avoid installation clashes with 5.0.7 (diff)
downloadzsh-0f73b35f4e0d8adad216ee6650bfef4622df43b1.tar
zsh-0f73b35f4e0d8adad216ee6650bfef4622df43b1.tar.gz
zsh-0f73b35f4e0d8adad216ee6650bfef4622df43b1.tar.bz2
zsh-0f73b35f4e0d8adad216ee6650bfef4622df43b1.tar.lz
zsh-0f73b35f4e0d8adad216ee6650bfef4622df43b1.tar.xz
zsh-0f73b35f4e0d8adad216ee6650bfef4622df43b1.tar.zst
zsh-0f73b35f4e0d8adad216ee6650bfef4622df43b1.zip
33391: vcs_info git: fix applied patch detection on git am
git-am also uses .git/rebase-apply for patch list but the file original-commit does not exist (as no commit exist). This patch handles both git rebase and git am. Also: - get the first line (rather than the first char) when the message contains only one line; - remove unused function (ironically that should have been used here).
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 445f1e709..57850eb0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-09 Marc Finet <m.dreadlock@gmail.com>
+
+ * 33391: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
+ vcs_info git: fix applied patch detection on git am
+
2014-10-08 Peter Stephenson <p.w.stephenson@ntlworld.com>
* unposted: Config/version.mk: update to 5.0.7-dev-0 to avoid