diff options
Diffstat (limited to 'src/rebase.c')
| -rw-r--r-- | src/rebase.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rebase.c b/src/rebase.c index 09941a2a2..bf1d086ba 100644 --- a/src/rebase.c +++ b/src/rebase.c @@ -546,7 +546,9 @@ static int rebase_ensure_not_dirty( } if (check_workdir) { - if ((error = git_diff_index_to_workdir(&diff, repo, index, NULL)) < 0) + git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; + diff_opts.ignore_submodules = GIT_SUBMODULE_IGNORE_UNTRACKED; + if ((error = git_diff_index_to_workdir(&diff, repo, index, &diff_opts)) < 0) goto done; if (git_diff_num_deltas(diff) > 0) { |