diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2012-11-24 04:17:02 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-11-26 11:05:12 -0800 |
| commit | 3b705268f54af35146d0b0f0562b8598521b8ced (patch) | |
| tree | c33ccfa78bb470803e3287a9bbe2c149eb798dac /git_remote_helpers | |
| parent | fast-export: avoid importing blob marks (diff) | |
| download | tgif-3b705268f54af35146d0b0f0562b8598521b8ced.tar.xz | |
remote-testgit: fix direction of marks
Basically this is what we want:
== pull ==
testgit transport-helper
* export -> import
# testgit.marks git.marks
== push ==
testgit transport-helper
* import <- export
# testgit.marks git.marks
Each side should be agnostic of the other side. Because testgit.marks
(our helper marks) could be anything, not necessarily a format parsable
by fast-export or fast-import. In this test they happen to be compatible,
because we use those tools, but in the real world it would be something
completely different. For example, they might be mapping marks to
mercurial revisions (certainly not parsable by fast-import/export).
This is what we have:
== pull ==
testgit transport-helper
* export -> import
# testgit.marks git.marks
== push ==
testgit transport-helper
* import <- export
# git.marks testgit.marks
The only reason this is working is that git.marks and testgit.marks are
roughly the same.
This new behavior used to not be possible before due to a bug in
fast-export, but with the bug fixed, it works fine.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git_remote_helpers')
| -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) |