git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* error using `git mergetool --tool=meld`
@ 2017-05-16 18:26 Matthew Groth
  2017-05-16 18:49 ` Samuel Lijin
  0 siblings, 1 reply; 3+ messages in thread
From: Matthew Groth @ 2017-05-16 18:26 UTC (permalink / raw)
  To: git

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.


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: error using `git mergetool --tool=meld`
  2017-05-16 18:26 error using `git mergetool --tool=meld` Matthew Groth
@ 2017-05-16 18:49 ` Samuel Lijin
  0 siblings, 0 replies; 3+ messages in thread
From: Samuel Lijin @ 2017-05-16 18:49 UTC (permalink / raw)
  To: Matthew Groth; +Cc: git@vger.kernel.org

Can you try `git config mergetool.meld.hasOutput true` and see if that
fixes the issue?

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: error using `git mergetool --tool=meld`
@ 2017-05-16 21:12 Matthew Groth
  0 siblings, 0 replies; 3+ messages in thread
From: Matthew Groth @ 2017-05-16 21:12 UTC (permalink / raw)
  To: git@vger.kernel.org


I tried `git config mergetool.meld.hasOutput true` followed again by 
`git mergetool --tool=meld` and got the same error.

My original message:

         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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-05-16 21:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-16 18:26 error using `git mergetool --tool=meld` Matthew Groth
2017-05-16 18:49 ` Samuel Lijin
  -- strict thread matches above, loose matches on Subject: below --
2017-05-16 21:12 Matthew Groth

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).