diff options
| -rw-r--r-- | git-remote-testgit.py | 2 | ||||
| -rw-r--r-- | git_remote_helpers/git/exporter.py | 9 | ||||
| -rwxr-xr-x | t/t5800-remote-helpers.sh | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/git-remote-testgit.py b/git-remote-testgit.py index df9d512f1a..e4a99a33ef 100644 --- a/git-remote-testgit.py +++ b/git-remote-testgit.py @@ -122,7 +122,7 @@ def do_import(repo, args): die("Need gitdir to import") repo = update_local_repo(repo) - repo.exporter.export_repo(repo.gitdir) + repo.exporter.export_repo(repo.gitdir, args) def do_export(repo, args): diff --git a/git_remote_helpers/git/exporter.py b/git_remote_helpers/git/exporter.py index f40f9d6a29..bc39163d77 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) diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh index 9db8ca884e..ca115ccb74 100755 --- a/t/t5800-remote-helpers.sh +++ b/t/t5800-remote-helpers.sh @@ -85,7 +85,7 @@ test_expect_success 'pushing remote local repo' ' compare_refs clone HEAD server HEAD ' -test_expect_failure 'fetch new branch' ' +test_expect_success 'fetch new branch' ' (cd public && git checkout -b new && echo content >>file && |