Use --no-ext-diff option when running `git diff`.

[mrstegeman]

If the user has an external diff command set up in their git config, such as vimdiff, things go haywire during installation.

[rmarquis]

Thanks. I vaguely remember an issue related to external diff viewer, but can't find the specific issue right now. I'll have a deeper look soon.

[mrstegeman]

If you want to reproduce, you can do the following: git config --global diff.external git_diff_wrapper

The put the following somewhere in your PATH as git_diff_wrapper:

#!/bin/sh

if file "$2" | grep -q text ; then
    vimdiff -c "set wrap" -c "wincmd w" -c "set wrap" -c "wincmd w" "$2" "$5"
elif file "$5" | grep -q text ; then
    vimdiff -c "set wrap" -c "wincmd w" -c "set wrap" -c "wincmd w" "$2" "$5"
else
    vbindiff "$2" "$5"
fi

After doing so, run pacaur -u to upgrade some existing packages (whose package data are already cached on your system). vimdiff will start up in the background, and you'll be forced to kill it in order to continue upgrading.

[rmarquis]

Merged, thx!