diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:09 -0800 |
| commit | 76523cac2688b1c9e8b56bd2c1a7a0ae1370e905 (patch) | |
| tree | 3fc94c5cfbe26194f841db0a2e7aedd2f4380cb8 /git_remote_helpers/git/importer.py | |
| parent | be7baf913a1c8e57fd871ebed17b47bec7687a9d (diff) | |
| parent | f28e7c904ac82b0c5e43805529e7d5296fa4d13b (diff) | |
Merge branch 'fc/fast-export-fixes'
Various updates to fast-export used in the context of the remote
helper interface.
* fc/fast-export-fixes:
fast-export: make sure updated refs get updated
fast-export: don't handle uninteresting refs
fast-export: fix comparison in tests
fast-export: trivial cleanup
remote-testgit: implement the "done" feature manually
remote-testgit: report success after an import
remote-testgit: exercise more features
remote-testgit: cleanup tests
remote-testgit: remove irrelevant test
remote-testgit: remove non-local functionality
Add new simplified git-remote-testgit
Rename git-remote-testgit to git-remote-testpy
remote-helpers: fix failure message
remote-testgit: fix direction of marks
fast-export: avoid importing blob marks
Diffstat (limited to 'git_remote_helpers/git/importer.py')
| -rw-r--r-- | git_remote_helpers/git/importer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git_remote_helpers/git/importer.py b/git_remote_helpers/git/importer.py index 5c6b595e16..e28cc8f986 100644 --- a/git_remote_helpers/git/importer.py +++ b/git_remote_helpers/git/importer.py @@ -39,7 +39,7 @@ class GitImporter(object): gitdir = self.repo.gitpath else: gitdir = os.path.abspath(os.path.join(dirname, '.git')) - path = os.path.abspath(os.path.join(dirname, 'git.marks')) + path = os.path.abspath(os.path.join(dirname, 'testgit.marks')) if not os.path.exists(dirname): os.makedirs(dirname) |