mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/filter-branch-submodule'

Browse Source 
* js/filter-branch-submodule:
  filter-branch: do not consider diverging submodules a 'dirty worktree'
  filter-branch: Fix fatal error on bare repositories
This commit is contained in:
Junio C Hamano
2009-02-07 11:09:48 -08:00
parent 7de265a4cf 26be15f09d
commit df4364a429
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t7003-filter-branch.sh
View File

@ -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' '