diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-07 20:09:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-07 20:09:48 +0100 |
| commit | df4364a42981dec067dbacfd6371d4ca910df48e (patch) | |
| tree | 862033510a057a827ee2e918f83ea0f438db876f /t/t7003-filter-branch.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | filter-branch: do not consider diverging submodules a 'dirty worktree' (diff) | |
| download | git-df4364a42981dec067dbacfd6371d4ca910df48e.tar.xz git-df4364a42981dec067dbacfd6371d4ca910df48e.zip | |
Merge branch 'js/filter-branch-submodule'
* js/filter-branch-submodule:
filter-branch: do not consider diverging submodules a 'dirty worktree'
filter-branch: Fix fatal error on bare repositories
Diffstat (limited to 't/t7003-filter-branch.sh')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 8537bf9160..cb0474336d 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -39,7 +39,9 @@ test_expect_success 'result is really identical' ' ' test_expect_success 'rewrite bare repository identically' ' - (git config core.bare true && cd .git && git filter-branch branch) + (git config core.bare true && cd .git && + git filter-branch branch > filter-output 2>&1 && + ! fgrep fatal filter-output) ' git config core.bare false test_expect_success 'result is really identical' ' |