Skip to content

Commit 0728012

Browse files
committed
diff-highlight: allow testing with Git 3.0 breaking changes
The diff-highlight (in contrib/) comes with its own test script, which relies on the initial branch name being 'master'. This is not just encoded in the test logic, but in the illustration in the file that shows the topology of the history. Force the initial branch name to 'master' to allow it pass. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f368df4 commit 0728012

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

contrib/diff-highlight/t/t9400-diff-highlight.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ DIFF_HIGHLIGHT="$CURR_DIR"/../diff-highlight
1010
CW="$(printf "\033[7m")" # white
1111
CR="$(printf "\033[27m")" # reset
1212

13+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
14+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
1315
. "$TEST_DIRECTORY"/test-lib.sh
1416

1517
if ! test_have_prereq PERL

0 commit comments

Comments
 (0)