summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Stelian Pop <stelian@popies.net>2008-02-15 22:20:44 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-02-15 23:01:49 -0800
commit13bf1a99764ea751f6fa75502309d8b91529623a (patch)
tree8e270b04467ece55d4421e006cf4dba028294759 /git-mergetool.sh
parentmailinfo: feed only one line to handle_filter() for QP input (diff)
downloadtgif-13bf1a99764ea751f6fa75502309d8b91529623a.tar.xz
hg-to-git: fix parent analysis
Fix a bug in the hg-to-git convertor introduced by commit 1bc7c13af9f936aa80893100120b542338a10bf4: when searching the changeset parents, 'hg log' returns an extra space at the end of the line, which confuses the .split(' ') based tokenizer: Traceback (most recent call last): File "hg-to-git.py", line 123, in <module> hgchildren[mparent] += ( str(cset), ) KeyError: '' Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions