summaryrefslogtreecommitdiff
path: root/git_remote_helpers
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-07-16 13:03:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-19 18:17:47 (GMT)
commit4e51ba238fb92ad732b4d34200fc8f53e29b333f (patch)
tree971454bf7c270112b351b8ce397bd6a00e0afd33 /git_remote_helpers
parentc00dd33b1fe602520f7b0e54b2c4d83b03571053 (diff)
downloadgit-4e51ba238fb92ad732b4d34200fc8f53e29b333f.zip
git-4e51ba238fb92ad732b4d34200fc8f53e29b333f.tar.gz
git-4e51ba238fb92ad732b4d34200fc8f53e29b333f.tar.bz2
git-remote-testgit: import non-HEAD refs
Upon receiving an "import" command, the testgit remote helper would ignore the ref asked for by git and generate a fast-export stream based on HEAD. Instead, we should actually give git the ref it asked for. This requires adding a new parameter to the export_repo method in the remote-helpers python library, which may be used by code outside of git.git. We use a default parameter so that callers without the new parameter will get the same behavior as before. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git_remote_helpers')
-rw-r--r--git_remote_helpers/git/exporter.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/git_remote_helpers/git/exporter.py b/git_remote_helpers/git/exporter.py
index f40f9d6..bc39163 100644
--- a/git_remote_helpers/git/exporter.py
+++ b/git_remote_helpers/git/exporter.py
@@ -15,7 +15,7 @@ class GitExporter(object):
self.repo = repo
- def export_repo(self, base):
+ def export_repo(self, base, refs=None):
"""Exports a fast-export stream for the given directory.
Simply delegates to git fast-epxort and pipes it through sed
@@ -23,8 +23,13 @@ class GitExporter(object):
default refs/heads. This is to demonstrate how the export
data can be stored under it's own ref (using the refspec
capability).
+
+ If None, refs defaults to ["HEAD"].
"""
+ if not refs:
+ refs = ["HEAD"]
+
dirname = self.repo.get_base_path(base)
path = os.path.abspath(os.path.join(dirname, 'testgit.marks'))
@@ -42,7 +47,7 @@ class GitExporter(object):
if os.path.exists(path):
args.append("--import-marks=" + path)
- args.append("HEAD")
+ args.extend(refs)
p1 = subprocess.Popen(args, stdout=subprocess.PIPE)