mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
fixup: do not unconditionally disable "diff -u"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4fdf71be1c
commit
7b3bdbb335
4
Makefile
4
Makefile
|
@ -1374,6 +1374,10 @@ ifdef USE_NED_ALLOCATOR
|
|||
COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
|
||||
endif
|
||||
|
||||
ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
|
||||
export GIT_TEST_CMP_USE_COPIED_CONTEXT
|
||||
endif
|
||||
|
||||
ifeq ($(TCLTK_PATH),)
|
||||
NO_TCLTK=NoThanks
|
||||
endif
|
||||
|
|
|
@ -6,14 +6,10 @@
|
|||
-include ../config.mak
|
||||
|
||||
#GIT_TEST_OPTS=--verbose --debug
|
||||
GIT_TEST_CMP ?= $(DIFF)
|
||||
SHELL_PATH ?= $(SHELL)
|
||||
TAR ?= $(TAR)
|
||||
RM ?= rm -f
|
||||
|
||||
# Make sure test-lib.sh uses make's value of GIT_TEST_CMP
|
||||
export GIT_TEST_CMP
|
||||
|
||||
# Shell quote;
|
||||
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
||||
|
||||
|
|
|
@ -63,7 +63,16 @@ export GIT_MERGE_VERBOSITY
|
|||
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
|
||||
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
|
||||
export EDITOR
|
||||
GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
|
||||
|
||||
if test -z "$GIT_TEST_CMP"
|
||||
then
|
||||
if test -n "$GIT_TEST_CMP_USE_COPIED_CONTEXT"
|
||||
then
|
||||
GIT_TEST_CMP="$DIFF -c"
|
||||
else
|
||||
GIT_TEST_CMP="$DIFF -u"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Protect ourselves from common misconfiguration to export
|
||||
# CDPATH into the environment
|
||||
|
|
Loading…
Reference in a new issue