From 8679e66cdc03780785397c9a846ee2ae78b7f948 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 26 Oct 2017 11:05:41 +0200
Subject: [PATCH] update vim-update.sh to merge with the oldest branch

---
 vim-update.sh | 1 -
 vim.spec      | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/vim-update.sh b/vim-update.sh
index 6cece6a4..403a6bcd 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -148,7 +148,6 @@ if [ $CHANGES -ne 0 ]; then
      fi
 
      # Increment index and cut the head of releases_regexp string
-     let "branches_index+=1"
      let "release_index+=1"
      releases_regexp=${releases_regexp#*|}
    done
diff --git a/vim.spec b/vim.spec
index c32c10aa..aaef1f29 100644
--- a/vim.spec
+++ b/vim.spec
@@ -770,6 +770,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu Oct 26 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1216-2
 - mention GVim in Summary and Description of vim-x11 subpackage
+- update vim-update.sh to merge with the oldest branch
 
 * Wed Oct 25 2017 Karsten Hopp <karsten@redhat.com> 8.0.1216-1
 - patchlevel 1216