Commit 2594a79 (remote-hg: fix bad state issue) originally introduced
this code in order to avoid synchronization issues while pushing,
because `git fast-export` might end up writing the marks before a crash
in the remote helper occurs.
However, the problem is in `git fast-export`; the marks should only be
written after both have finished successfully.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
git-remote-bzr.py | 8 +++-----
git-remote-hg.py | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/git-remote-bzr.py b/git-remote-bzr.py
index 9abb58e..71b138e 100755
--- a/git-remote-bzr.py
+++ b/git-remote-bzr.py
@@ -971,12 +971,10 @@ def main(args):
die('unhandled command: %s' % line)
sys.stdout.flush()
+ marks.store()
+
def bye():
- if not marks:
- return
- if not is_tmp:
- marks.store()
- else:
+ if is_tmp:
shutil.rmtree(dirname)
atexit.register(bye)
diff --git a/git-remote-hg.py b/git-remote-hg.py
index 204ceeb..8aca6dd 100755
--- a/git-remote-hg.py
+++ b/git-remote-hg.py
@@ -1258,12 +1258,10 @@ def main(args):
die('unhandled command: %s' % line)
sys.stdout.flush()
+ marks.store()
+
def bye():
- if not marks:
- return
- if not is_tmp:
- marks.store()
- else:
+ if is_tmp:
shutil.rmtree(dirname)
atexit.register(bye)
--
1.9.2+fc1.3.gade8541
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html