From 50d6954a47fdce977bc0853e53a2bb14ff04ca90 Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Sat, 9 Mar 2013 17:07:49 -0500
Subject: [PATCH] Fix "git archive" command in invirtibuilder
---
debian/changelog | 7 +++++++
invirtibuilder | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e931861..c98533e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-dev (0.1.21) unstable; urgency=low
+
+ * The "git archive" command broke on recent Git. Replace
+ --remote=file: with the standard --git-dir, which works.
+
+ -- Greg Price <price@mit.edu> Sat, 09 Mar 2013 17:06:42 -0500
+
invirt-dev (0.1.20) unstable; urgency=low
* Support getting Git commits from elsewhere, for xvm-dev
diff --git a/invirtibuilder b/invirtibuilder
index bf3b499..fd1417f 100755
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -287,8 +287,8 @@ def packageWorkdir(package, commit, build_id):
workdir = tempfile.mkdtemp(prefix=("b%d-" % build_id))
try:
p_archive = subprocess.Popen(
- ['git', 'archive',
- '--remote=file://%s' % b.getRepo(package),
+ ['git', '--git-dir=%s' % (b.getRepo(package),),
+ 'archive',
'--prefix=%s/' % package,
commit,
],
--
1.7.9.5