git diff sometimes brings up buggy pager
When I do `git diff` sometimes I get this: ...skipping... ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ...skipping... ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ...skipping... ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ it goes on like this for about 10 times the length. Looks like this happens exclusively when I use git diff with a github remote that is at the same commit. I will update if I find any other case where this happens.
Re: [fixed] error using `git mergetool --tool=meld`
I'm on Meld 3.16.0, OSX 10.12.4, git 2.12.2 and haven't changed any git or meld code. Let me know when its fixed so I can turn hasOutput back on? Thanks and good luck. On 5/16/17 9:05 PM, Samuel Lijin wrote: On Tue, May 16, 2017 at 5:55 PM, Matthew Groth <mgrot...@gmail.com> wrote: I needed to use `git config mergetool.meld.hasOutput false` Hm, that's interesting - the source code snippet you quoted from meld implies it supports --output. What version of meld do you have? David Aguilar seems to be the one who's contributed most of the meld code, perhaps he might have an idea about why this is happening.
[fixed] error using `git mergetool --tool=meld`
I needed to use `git config mergetool.meld.hasOutput false`
Re: error using `git mergetool --tool=meld`
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
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
error using `git mergetool --tool=meld`
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
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.
