[SCM] Vim packaging branch, debian, updated. upstream/7.1.ds-330-g06e0a07

[Pierre Habouzit]

The following commit has been merged in the debian branch:
commit 06e0a070efd5a12c2938d875567e984c0a3c2c89
Author: Pierre Habouzit <madcoder at debian.org>
Date:   Sun Mar 30 22:42:26 2008 +0200

    Last bits of tidying, simplifications.
    
    put git idioms front, like any git shell script out there.
    avoid to change user's branch under his feets if unneeded.
    merge git add and git commit.
    fix typo.
    
    Signed-off-by: Pierre Habouzit <madcoder at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index ad63f10..c230a2a 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -11,17 +11,16 @@ SUBDIRECTORY_OK=
 . git-sh-setup
 require_work_tree
 
-host='ftp.vim.org'
-version='7.1'
-dir="pub/vim/patches/$version"
-
 git rev-parse --verify HEAD > /dev/null && \
     git update-index --refresh && \
     git diff-files --quiet && \
     git diff-index --cached --quiet HEAD -- \
     || die "Your tree is unclean, can't do that..."
 
-git checkout debian
+
+host='ftp.vim.org'
+version='7.1'
+dir="pub/vim/patches/$version"
 
 curpatch=$(dpkg-parsechangelog | awk '/^Version:/{print $2}' | sed 's/^.*\.\([0-9]*\)\+-[0-9]\+$/\1/')
 curpatch=$(($curpatch + 1))
@@ -32,12 +31,13 @@ if [ $curpatch -ge $newpatch ]; then
     exit
 fi
 
+git checkout debian
+
 echo 'updating debian/README to latest upstream ...'
 lftp -c "open $host; cd $dir; get README -o debian/README"
-git add debian/README
 # Store debian/README while we update the other branches.  The debian branch
 # will get reset to before this commit at the end of the script.
-git commit -m 'Stash'
+git commit -m 'Stash' -- debian/README
 
 git checkout upstream
 
@@ -67,7 +67,7 @@ for b in $(git for-each-ref --format="%(refname)" "refs/heads/deb/*" | sed 's at re
     fi
 done
 
-# Undo the debian/README commit but leave the new README in tact so the user
+# Undo the debian/README commit but leave the new README intact so the user
 # can add add/update debian/changelog
 git reset HEAD~1
 

-- 
Vim packaging