diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:24 -0800 |
| commit | a91de2172dac7e73de2088a7fdfeb532baa3bfca (patch) | |
| tree | fc66de57ff479778ddf334ac202564a11aed2693 | |
| parent | 448a65c93b60ef7fe3c02e48e9bb5e5a31554c06 (diff) | |
| parent | 0728012c537de800bb6cf2b6faac3f4d746a058e (diff) | |
| download | git-a91de2172dac7e73de2088a7fdfeb532baa3bfca.tar.xz | |
Merge branch 'jc/diff-highlight-main-master-testfix'
Test fix (in contrib/)
* jc/diff-highlight-main-master-testfix:
diff-highlight: allow testing with Git 3.0 breaking changes
| -rwxr-xr-x | contrib/diff-highlight/t/t9400-diff-highlight.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh index f6f5195d00..dee296739c 100755 --- a/contrib/diff-highlight/t/t9400-diff-highlight.sh +++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh @@ -10,6 +10,8 @@ DIFF_HIGHLIGHT="$CURR_DIR"/../diff-highlight CW="$(printf "\033[7m")" # white CR="$(printf "\033[27m")" # reset +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . "$TEST_DIRECTORY"/test-lib.sh if ! test_have_prereq PERL |