[SCM] Vim packaging branch, debian, updated. upstream/7.2c.000-214-g869c5cf

[James Vega]

The following commit has been merged in the debian branch:
commit 869c5cf8d713f21b9112190e3ec0cce8208d6f04
Author: James Vega <jamessan at debian.org>
Date:   Sat Aug 9 21:39:38 2008 -0400

    Temporarily commit debian/README with update-patches -u
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 57795b0..43843e7 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -58,17 +58,15 @@ fi
 
 curpatch=$(($curpatch + 1))
 
-if [ $onlyupstream -eq 0 ]; then
-    git checkout debian
+git checkout debian
 
-    echo 'updating debian/README to latest upstream ...'
-    lftp -c "open $host; cd $dir; get README -o debian/README"
+echo 'updating debian/README to latest upstream ...'
+lftp -c "open $host; cd $dir; get README -o debian/README"
 
-    # Specifically using "git add" instead of "git commit -- debian/README" since
-    # debian/README may not always be tracked
-    git add debian/README
-    git commit -m "Update README for patches $curpatch - $newpatch"
-fi
+# Specifically using "git add" instead of "git commit -- debian/README" since
+# debian/README may not always be tracked
+git add debian/README
+git commit -m "Update README for patches $curpatch - $newpatch"
 
 git checkout upstream
 
@@ -98,6 +96,9 @@ if [ $onlyupstream -eq 0 ]; then
         checkout_and_merge $b upstream-runtime
     done
 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
 fi
 

-- 
Vim packaging