summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorjcb91 <joshuacookebarnes@gmail.com>2013-12-07 13:09:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-09 21:18:43 (GMT)
commit257ec841b88552471ff45f2e89e9b1142c737231 (patch)
treed3a642d21739c14d99848bc184a9eaf6d59ecdc4 /contrib
parent077f43447c4931dd2e7890f16e8728f7f7376b87 (diff)
downloadgit-257ec841b88552471ff45f2e89e9b1142c737231.zip
git-257ec841b88552471ff45f2e89e9b1142c737231.tar.gz
git-257ec841b88552471ff45f2e89e9b1142c737231.tar.bz2
remote-hg: avoid buggy strftime()
error on pull: fatal: Invalid raw date "" in ident: remote-hg <> Neither %s nor %z are officially supported by python, they may work on some (most?) platforms, but not all. removed strftime use of %s and %z, which are not officially supported by python, with standard formats Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 30402d5..3cd964d 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -537,7 +537,7 @@ def export_ref(repo, name, kind, head):
print "commit %s" % ref
print "mark :%d" % (note_mark)
- print "committer remote-hg <> %s" % (ptime.strftime('%s %z'))
+ print "committer remote-hg <> %d %s" % (ptime.time(), gittz(ptime.timezone))
desc = "Notes for %s\n" % (name)
print "data %d" % (len(desc))
print desc