diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
commit | a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13 (patch) | |
tree | 0ff1a62d28a13bc8d8708148b85d3b0ba2632f92 /t/t0001-init.sh | |
parent | Merge branch 'master' of https://github.com/Softcatala/git-po (diff) | |
parent | Git 2.22-rc2 (diff) | |
download | tgif-a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
Git 2.22-rc2
...
Diffstat (limited to 't/t0001-init.sh')
-rwxr-xr-x | t/t0001-init.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 1f462204ea..77a224aafb 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -93,7 +93,7 @@ test_expect_success 'No extra GIT_* on alias scripts' ' sed -n \ -e "/^GIT_PREFIX=/d" \ -e "/^GIT_TEXTDOMAINDIR=/d" \ - -e "/^GIT_TR2_PARENT/d" \ + -e "/^GIT_TRACE2_PARENT/d" \ -e "/^GIT_/s/=.*//p" | sort EOF |