[SCM] Vim packaging branch, debian, updated. upstream/7.1.ds-326-g85df18c

[Pierre Habouzit]

The following commit has been merged in the debian branch:
commit 85df18c8ee17c82427b8beae7497c998397302e0
Author: Pierre Habouzit <madcoder at debian.org>
Date:   Sun Mar 30 22:21:07 2008 +0200

    use better git scripting-fu.
    
    * git apply --index is faster than patch then git add.
    * git show <ref> is easier to the eye.
    
    Signed-off-by: Pierre Habouzit <madcoder at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 01051e4..4a1e2e0 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -32,13 +32,12 @@ git checkout upstream
 
 lftp -c "open $host; cd $dir; get $(seq -f $version.%03g -s' ' $curpatch $newpatch)"
 for p in $(seq -f $version.%03g $curpatch $newpatch); do
-    patch -Np0 < $p
-    git add $(lsdiff $p)
+    git apply --index -p0 "$p"
     author="$(git cat-file blob debian:debian/README | \
               sed -n -e 's/^From: *//;t done;d;: done')"
     subject="s/^ *[0-9]* *$p *//;t done;d;: done;p"
     msg='/^Patch /,/^Files:/{s/^Files:.*//;t;p}'
-    (git cat-file blob debian:debian/README | sed -n "$subject"; \
+    (git show debian:debian/README -- | sed -n "$subject"; \
      sed -n "$msg" $p) | git commit -A "$author" -F -
     rm $p
 done

-- 
Vim packaging