Cherry-pick a03227de (33405: vcs_info: Make sure maxexports is set when VCS_INFO_set is called) from upstream

3 files changed, 72 insertions, 0 deletions

diff --git a/debian/patches/cherry-pick-0f73b35f-33391-vcs-info-git-fix-applied-patch-detection-on-git-am.patch b/debian/patches/cherry-pick-0f73b35f-33391-vcs-info-git-fix-applied-patch-detection-on-git-am.patch
new file mode 100644
index 000000000..758fa09ff
--- /dev/null
+++ b/debian/patches/cherry-pick-0f73b35f-33391-vcs-info-git-fix-applied-patch-detection-on-git-am.patch
@@ -0,0 +1,51 @@
+Origin: commit 0f73b35f4e0d8adad216ee6650bfef4622df43b1
+Author: Marc Finet <m.dreadlock@gmail.com>
+Date:   Thu Oct 9 00:24:45 2014 +0200
+Description: 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).
+
+diff --git a/ChangeLog b/ChangeLog
+index 445f1e7..57850eb 100644
+diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+index ee50be6..48d552f 100644
+--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
++++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+@@ -195,14 +195,6 @@ fi
+ VCS_INFO_adjust
+ VCS_INFO_git_getaction ${gitdir}
+ 
+-
+-VCS_INFO_get_get_rebase()
+-{
+-    if [[ -f "$1" ]]; then
+-       echo "$(< "$1")"
+-    fi
+-}
+-
+ local patchdir=${gitdir}/patches/${gitbranch}
+ if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \
+    && [[ -f $patchdir/unapplied ]]
+@@ -223,11 +215,16 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
+     # Fake patch names for all but current patch
+     patchdir="${gitdir}/rebase-apply"
+     local cur=$(< "${patchdir}/next")
+-    local p
++    local p subject
+     for p in $(seq $(($cur - 1))); do
+         git_patches_applied+=("$(printf "%04d" $p) ?")
+     done
+-    git_patches_applied+=("$(< "${patchdir}/original-commit") ${${(f)$(< "${patchdir}/msg-clean")}[1]}")
++    subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
++    if [[ -f "${patchdir}/original-commit" ]]; then
++        git_patches_applied+=("$(< ${patchdir}/original-commit) $subject")
++    else
++        git_patches_applied+=("? $subject")
++    fi
+     git_patches_unapplied=($(seq $cur $(< "${patchdir}/last")))
+ 
+     VCS_INFO_git_handle_patches
diff --git a/debian/patches/cherry-pick-a03227de-33405-vcs-info-make-sure-maxexports-is-set-when-vcs-info-set-is-called.patch b/debian/patches/cherry-pick-a03227de-33405-vcs-info-make-sure-maxexports-is-set-when-vcs-info-set-is-called.patch
new file mode 100644
index 000000000..41d5a069a
--- /dev/null
+++ b/debian/patches/cherry-pick-a03227de-33405-vcs-info-make-sure-maxexports-is-set-when-vcs-info-set-is-called.patch
@@ -0,0 +1,19 @@
+Origin: commit a03227de23f623370ab6a6eaf8d22e8d9b1a3aae
+Author: Frank Terbeck <ft@bewatermyfriend.org>
+Date:   Thu Oct 9 18:09:36 2014 +0200
+Description: 33405: vcs_info: Make sure maxexports is set when VCS_INFO_set is called
+
+diff --git a/ChangeLog b/ChangeLog
+index 57850eb..b27895c 100644
+diff --git a/Functions/VCS_Info/vcs_info b/Functions/VCS_Info/vcs_info
+index 5a421df..4693869 100644
+--- a/Functions/VCS_Info/vcs_info
++++ b/Functions/VCS_Info/vcs_info
+@@ -94,6 +94,7 @@ vcs_info () {
+ 
+     for pat in ${dps} ; do
+         if [[ ${PWD} == ${~pat} ]] ; then
++            VCS_INFO_maxexports
+             [[ -n ${vcs_info_msg_0_} ]] && VCS_INFO_set --nvcs
+             return 0
+         fi
diff --git a/debian/patches/series b/debian/patches/series
index 5e195e34f..c84ec75f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 replace-texi2html-with-makeinfo
 cherry-pick-9982ab6f-missing-changelog-entry
+cherry-pick-0f73b35f-33391-vcs-info-git-fix-applied-patch-detection-on-git-am.patch
+cherry-pick-a03227de-33405-vcs-info-make-sure-maxexports-is-set-when-vcs-info-set-is-called.patch