diff options
| author | Jeff King <peff@peff.net> | 2012-10-29 04:13:49 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 04:13:49 -0400 |
| commit | deb2458132a5886c8f7b12870451a1bc3c311e9f (patch) | |
| tree | f08e13b947ce2c8e8c41aaa8df4740121d880110 /t | |
| parent | e034d1bb927c17a3406a2bdbb8ccf710677a139d (diff) | |
| parent | 3c730fab2cae1bb52d34620af170a628b3b8c537 (diff) | |
| download | git-deb2458132a5886c8f7b12870451a1bc3c311e9f.tar.gz git-deb2458132a5886c8f7b12870451a1bc3c311e9f.tar.xz | |
Merge branch 'jk/sh-setup-in-filter-branch'
Refactoring to avoid code duplication in shell scripts.
* jk/sh-setup-in-filter-branch:
filter-branch: use git-sh-setup's ident parsing functions
git-sh-setup: refactor ident-parsing functions
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 4d13e10de..1e7a209ef 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -167,10 +167,11 @@ test_expect_success 'author information is preserved' ' test_tick && GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips && git branch preserved-author && - git filter-branch -f --msg-filter "cat; \ + (sane_unset GIT_AUTHOR_NAME && + git filter-branch -f --msg-filter "cat; \ test \$GIT_COMMIT != $(git rev-parse master) || \ echo Hallo" \ - preserved-author && + preserved-author) && test 1 = $(git rev-list --author="B V Uips" preserved-author | wc -l) ' |