diff options
| author |  jcb91 <joshuacookebarnes@gmail.com> | 2013-12-07 07:09:40 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-12-09 13:18:43 -0800 |
| commit | 257ec841b88552471ff45f2e89e9b1142c737231 (patch) | |
| tree | d3a642d21739c14d99848bc184a9eaf6d59ecdc4 /contrib/remote-helpers | |
| parent | Start 1.9 cycle (diff) | |
| download | tgif-257ec841b88552471ff45f2e89e9b1142c737231.tar.xz | |
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/remote-helpers')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 30402d5532..3cd964dd2d 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 |