Get TZ offset from C localtime, given tm_gmtoff

[bup.git] / lib / bup / git.py

diff --git a/lib/bup/git.py b/lib/bup/git.py
index 543d55d91af6551bccd49b73a7b65347e112d845..2fc155f6a49ed8a81ef5b5580d7c19fa231334f4 100644 (file)
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -761,7 +761,7 @@ class PackWriter:
 
 
 def _git_date(date):
-    return '%d %s' % (date, time.strftime('%z', time.localtime(date)))
+    return '%d %s' % (date, utc_offset_str(date))
 
 
 def _gitenv(repo_dir = None):
@@ -871,13 +871,22 @@ def rev_parse(committish, repo_dir=None):
     return None
 
 
-def update_ref(refname, newval, oldval):
-    """Change the commit pointed to by a branch."""
+def update_ref(refname, newval, oldval, repo_dir=None):
+    """Update a repository reference."""
     if not oldval:
         oldval = ''
-    assert(refname.startswith('refs/heads/'))
+    assert(refname.startswith('refs/heads/') \
+           or refname.startswith('refs/tags/'))
     p = subprocess.Popen(['git', 'update-ref', refname,
                           newval.encode('hex'), oldval.encode('hex')],
+                         preexec_fn = _gitenv(repo_dir))
+    _git_wait('git update-ref', p)
+
+
+def delete_ref(refname):
+    """Delete a repository reference."""
+    assert(refname.startswith('refs/'))
+    p = subprocess.Popen(['git', 'update-ref', '-d', refname],
                          preexec_fn = _gitenv())
     _git_wait('git update-ref', p)