diff options
| author | Vicent Marti <vicent@github.com> | 2014-04-25 02:04:12 -0700 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-04-25 02:04:12 -0700 |
| commit | 2ad51b81d2d735c50549f16c308d61c0a5ed990c (patch) | |
| tree | 206483ccc5c59eafe9f7036faaf8ecf26ea40de7 /src/stash.c | |
| parent | af9eeac93929bdf10c30e60f34717959d83b6bd3 (diff) | |
| parent | a409acefbbadeb607e4d6dde681bff5aed6ae9fc (diff) | |
| download | libgit2-2ad51b81d2d735c50549f16c308d61c0a5ed990c.tar.gz | |
Merge pull request #2241 from libgit2/rb/stash-skip-submodules
Improve stash and checkout for ignored + untracked items
Diffstat (limited to 'src/stash.c')
| -rw-r--r-- | src/stash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/stash.c b/src/stash.c index d20e29b80..86e0a627c 100644 --- a/src/stash.c +++ b/src/stash.c @@ -178,7 +178,8 @@ static int stash_update_index_from_diff( break; case GIT_DELTA_UNTRACKED: - if (data->include_untracked) + if (data->include_untracked && + delta->new_file.mode != GIT_FILEMODE_TREE) add_path = delta->new_file.path; break; |