diff options
| author | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2013-09-27 17:07:06 -0700 |
|---|---|---|
| committer | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2013-09-27 17:07:06 -0700 |
| commit | 4fe0b0b34b3700d6da681498f0077a455d14812b (patch) | |
| tree | 41ebbb18475028ba3f650d9c3857801a33666190 /src/stash.c | |
| parent | ac316e743878908df762cc0ea07a71cbee5c5802 (diff) | |
| download | libgit2-4fe0b0b34b3700d6da681498f0077a455d14812b.tar.gz | |
Never consider submodules for stashing
Diffstat (limited to 'src/stash.c')
| -rw-r--r-- | src/stash.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/stash.c b/src/stash.c index ab4a68575..7742eee19 100644 --- a/src/stash.c +++ b/src/stash.c @@ -316,6 +316,8 @@ static int build_workdir_tree( struct cb_data data = {0}; int error; + opts.flags = GIT_DIFF_IGNORE_SUBMODULES; + if ((error = git_commit_tree(&b_tree, b_commit)) < 0) goto cleanup; @@ -474,12 +476,14 @@ static int ensure_there_are_changes_to_stash( git_status_options opts = GIT_STATUS_OPTIONS_INIT; opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR; + opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES; + if (include_untracked_files) - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | + opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED | GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; if (include_ignored_files) - opts.flags = GIT_STATUS_OPT_INCLUDE_IGNORED; + opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED; error = git_status_foreach_ext(repo, &opts, is_dirty_cb, NULL); |