From: Avery Pennarun <apenwarr@gmail.com>
Date: Sun, 24 Jan 2010 22:52:41 +0000 (-0500)
Subject: Minor changes to make bup work with git as far back as 1.5.3.1.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1a0bea08dd166a9d65c1c9284d6a15246c3f702f;p=packages%2Fb%2Fbup.git

Minor changes to make bup work with git as far back as 1.5.3.1.
---

diff --git a/git.py b/git.py
index a94f53c..c8804d3 100644
--- a/git.py
+++ b/git.py
@@ -409,7 +409,8 @@ def read_ref(refname):
 def update_ref(refname, newval, oldval):
     if not oldval:
         oldval = ''
-    p = subprocess.Popen(['git', 'update-ref', '--', refname,
+    assert(refname.startswith('refs/heads/'))
+    p = subprocess.Popen(['git', 'update-ref', refname,
                           newval.encode('hex'), oldval.encode('hex')],
                          preexec_fn = _gitenv)
     _git_wait('git update-ref', p)
@@ -471,7 +472,7 @@ def ver():
         if not m:
             raise GitError('git --version weird output: %r' % gvs)
         _ver = tuple(m.group(1).split('.'))
-    needed = ('1','5','4')
+    needed = ('1','5', '3', '1')
     if _ver < needed:
         raise GitError('git version %s or higher is required; you have %s'
                        % ('.'.join(needed), '.'.join(_ver)))