diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-04-12 13:38:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-23 11:19:48 +0000 |
| commit | 3ea073ada141164ed2999c142439fe86a220615e (patch) | |
| tree | adc5070366d65f98c81af02f4926c2ebfb1ae294 /init-repository | |
| parent | c6189f9723396c484658890d62816b95f91432fd (diff) | |
ignore submodules in dirtiness check
changed submodule sha1s should not prevent updating.
Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'init-repository')
| -rwxr-xr-x | init-repository | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init-repository b/init-repository index 861511b9..11a75ffd 100755 --- a/init-repository +++ b/init-repository @@ -469,7 +469,7 @@ sub git_stat_one_submodule my $orig_cwd = getcwd(); chdir($submodule) or confess "chdir $submodule: $OS_ERROR"; - my @sts = qx(git status --porcelain --untracked=no); + my @sts = qx(git status --porcelain --untracked=no --ignore-submodules=all); # After a git clone --no-checkout, git status reports all files as # staged for deletion, but we still want to update the submodule. |