summaryrefslogtreecommitdiff
path: root/tests/stash/stash_helpers.c
Commit message (Collapse)AuthorAgeFilesLines
* stash tests: ensure we save the workdir fileEdward Thomson2015-06-231-0/+5
| | | | | | Ensure that when a file is added in the index and subsequently modified in the working directory, the stashed working directory tree contains the actual working directory contents.
* Make checkout match diff for untracked/ignored dirRussell Belfer2014-04-221-1/+0
| | | | | | | | | | | | | | | | | | When diff finds an untracked directory, it emulates Git behavior by looking inside the directory to see if there are any untracked items inside it. If there are only ignored items inside the dir, then diff considers it ignored, even if there is no direct ignore rule for it. Checkout was not copying this behavior - when it found an untracked directory, it just treated it as untracked. Unfortunately, when combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that checkout (and stash, which uses checkout) was removing ignored items when you had only asked it to remove untracked ones. This commit moves the logic for advancing past an untracked dir while scanning for non-ignored items into an iterator helper fn, and uses that for both diff and checkout.
* Make stash and checkout ignore contained reposRussell Belfer2014-04-221-8/+5
| | | | | | | | | | | To emulate git, stash should not remove untracked git repositories inside the parent repo, and checkout's REMOVE_UNTRACKED should also skip over these items. `git stash` actually prints a warning message for these items. That should be possible with a checkout notify callback if you wanted to, although it would require a bit of extra logic as things are at the moment.
* Rename tests-clar to testsBen Straub2013-11-141-0/+56