undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1

Browse Source 
* js/maint-1.6.1-filter-branch-submodule:
  filter-branch: do not consider diverging submodules a 'dirty worktree'
This commit is contained in:
Junio C Hamano 2009-03-12 21:46:50 -07:00
commit 532b74b210
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-filter-branch.sh
View File

@ -98,7 +98,7 @@ OPTIONS_SPEC=
. git-sh-setup . git-sh-setup
if [ "$(is_bare_repository)" = false ]; then if [ "$(is_bare_repository)" = false ]; then
git diff-files --quiet && git diff-files --ignore-submodules --quiet &&
git diff-index --cached --quiet HEAD -- || git diff-index --cached --quiet HEAD -- ||
die "Cannot rewrite branch(es) with a dirty working directory." die "Cannot rewrite branch(es) with a dirty working directory."
fi fi