[SCM] Vim packaging branch, debian, updated. upstream/7.2.000-222-ge3dd8b8

James Vega jamessan at debian.org
Wed Aug 20 15:26:02 UTC 2008


The following commit has been merged in the debian branch:
commit e3dd8b844d0c6fbc7c4c244521f35f45e4a3a778
Author: James Vega <jamessan at debian.org>
Date:   Wed Aug 20 11:25:11 2008 -0400

    Checkout debian before calling reset --hard.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 582395b..068dcbb 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -98,8 +98,8 @@ if [ $onlyupstream -eq 0 ]; then
 else
     # Revert the debian/README commit which was solely used to generate proper
     # commit messages in the upstream branch
-    git reset --hard HEAD^
     git checkout debian
+    git reset --hard HEAD^
 fi
 
 echo "Patches $curpatch - $newpatch comitted and merged."

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list