summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-18 12:03:01 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-18 12:03:01 -0700
commitc5926ac37772e766ff320c61641ad3b935643242 (patch)
tree21e0ee52201865e24778009423fb639d6b3681a2
parentded56521bda84a1b73b198f6cf3a2ac5829446d0 (diff)
parent845241d5446c6c4be70fcaa9f7b605e7c6760181 (diff)
downloadgit-c5926ac37772e766ff320c61641ad3b935643242.tar.gz
Merge branch 'maint'
* maint: remote-hg: fix commit messages
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 328c2dc76d..45f6c80d45 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -326,6 +326,8 @@ def export_ref(repo, name, kind, head):
else:
modified, removed = get_filechanges(repo, c, parents[0])
+ desc += '\n'
+
if mode == 'hg':
extra_msg = ''
@@ -349,7 +351,6 @@ def export_ref(repo, name, kind, head):
else:
extra_msg += "extra : %s : %s\n" % (key, urllib.quote(value))
- desc += '\n'
if extra_msg:
desc += '\n--HG--\n' + extra_msg