# along with this program. If not, see <http://www.gnu.org/licenses/>.
-set -e
+set -eu
. ../lib.sh
echo 'gitconfig: removing color.function'
sed_i 's/^[[:space:]]*function = .*//' gitconfig
fi
- # Older Git versions don't support --patience.
- if ! git diff --patience >/dev/null 2>&1; then
- echo 'gitconfig: removing --patience'
- sed_i 's/--patience//' gitconfig
- fi
# Even older Git versions don't support git log --patch but only -p.
if ! git log --patch >/dev/null 2>&1; then
echo 'gitconfig: replacing git log --patch with -p'
sed_i 's/log --patch/log -p/' gitconfig
fi
+
# If coloredstderr is used to color stderr then remove the workaround for
# missing output to stderr.
- if printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
+ if test -n "${LD_PRELOAD:+set}" \
+ && printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
echo 'gitconfig: removing stderr fix'
sed_i '/^\t\(fs\|fg\) =/ s/2>&1//' gitconfig
fi
fi
if installed tig; then
- link tigrc ~/.tigrc
+ if tig --version | grep -F 'tig version 1.' >/dev/null; then
+ link tigrc.old ~/.tigrc
+ else
+ link tigrc ~/.tigrc
+ fi
fi
if installed hg; then