diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/stash/save.c | 6 | ||||
| -rw-r--r-- | tests/stash/stash_helpers.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/stash/save.c b/tests/stash/save.c index 7bbd4c8dc..87c6d7e0f 100644 --- a/tests/stash/save.c +++ b/tests/stash/save.c @@ -155,10 +155,16 @@ void test_stash_save__untracked_skips_ignored(void) cl_must_pass(p_mkdir("stash/bundle/vendor", 0777)); cl_git_mkfile("stash/bundle/vendor/blah", "contents\n"); + cl_assert(git_path_exists("stash/when")); /* untracked */ + cl_assert(git_path_exists("stash/just.ignore")); /* ignored */ + cl_assert(git_path_exists("stash/bundle/vendor/blah")); /* ignored */ + cl_git_pass(git_stash_save( &stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); + cl_assert(!git_path_exists("stash/when")); cl_assert(git_path_exists("stash/bundle/vendor/blah")); + cl_assert(git_path_exists("stash/just.ignore")); } void test_stash_save__can_include_untracked_and_ignored_files(void) diff --git a/tests/stash/stash_helpers.c b/tests/stash/stash_helpers.c index 29cb25c5f..ff683eced 100644 --- a/tests/stash/stash_helpers.c +++ b/tests/stash/stash_helpers.c @@ -42,7 +42,6 @@ void assert_status( int status_flags) { unsigned int status; - int error; if (status_flags < 0) cl_assert_equal_i(status_flags, git_status_file(&status, repo, path)); |