git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Matthew Groth <mgroth49@gmail.com>
To: git@vger.kernel.org
Subject: error using `git mergetool --tool=meld`
Date: Tue, 16 May 2017 14:26:07 -0400	[thread overview]
Message-ID: <83801c20-96e6-7f9c-1e0e-2d46e32dc5f6@gmail.com> (raw)

When using `git mergetool --tool=kdiff3`, it works fine. But with `git 
mergetool --tool=meld` I get this for every merge conflict:

```
Normal merge conflict for 'builders/pdfBuilder.py':
   {local}: created file
   {remote}: created file
Traceback (most recent call last):
   File "/usr/local/bin/meld", line 20, in <module>
     filename = arg.split('=')[1]
IndexError: list index out of range
builders/pdfBuilder.py seems unchanged.
```

And the contents of /usr/local/bin/meld are:

arglist = []
for arg in sys.argv[1:]:
     if arg.startswith('--output'):
         filename = arg.split('=')[1] ##### <<--------- line 20
         newArg = '--output=' + fix_abspath(filename)
     elif arg.startswith('-'):
         newArg = arg
     else:
         newArg = fix_abspath(arg)
     arglist.append(newArg)

I'm on OSX: 10.12.4

git --version
git version 2.12.2

This is my first post to the mailing list, sorry if the bug report is 
missing anything.


             reply	other threads:[~2017-05-16 18:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-16 18:26 Matthew Groth [this message]
2017-05-16 18:49 ` error using `git mergetool --tool=meld` Samuel Lijin
  -- strict thread matches above, loose matches on Subject: below --
2017-05-16 21:12 Matthew Groth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83801c20-96e6-7f9c-1e0e-2d46e32dc5f6@gmail.com \
    --to=mgroth49@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).