proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-10 08:48:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2155 from jacquesg/stash-save-remove-ignored

Browse Source 
Remove ignored files from the working directory if they were stashed
This commit is contained in:
Russell Belfer 2014-03-04 10:21:41 -08:00
commit 0a62caf4e4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/stash.c
View File

@ -465,7 +465,8 @@ static int ensure_there_are_changes_to_stash(
static int reset_index_and_workdir( static int reset_index_and_workdir(
git_repository *repo, git_repository *repo,
git_commit *commit, git_commit *commit,
bool remove_untracked) bool remove_untracked,
bool remove_ignored)
{ {
git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT; git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
@ -474,6 +475,9 @@ static int reset_index_and_workdir(
if (remove_untracked) if (remove_untracked)
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED; opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED;
if (remove_ignored)
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED;
return git_checkout_tree(repo, (git_object *)commit, &opts); return git_checkout_tree(repo, (git_object *)commit, &opts);
} }
@ -532,7 +536,8 @@ int git_stash_save(
if ((error = reset_index_and_workdir( if ((error = reset_index_and_workdir(
repo, repo,
((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit, ((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit,
(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0)) < 0) (flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
goto cleanup; goto cleanup;
cleanup: cleanup:

2
tests/stash/save.c
View File

@ -159,6 +159,8 @@ void test_stash_save__can_include_untracked_and_ignored_files(void)
assert_blob_oid("refs/stash^3:who", NULL); assert_blob_oid("refs/stash^3:who", NULL);
assert_blob_oid("refs/stash^3:when", "b6ed15e81e2593d7bb6265eb4a991d29dc3e628b"); assert_blob_oid("refs/stash^3:when", "b6ed15e81e2593d7bb6265eb4a991d29dc3e628b");
assert_blob_oid("refs/stash^3:just.ignore", "78925fb1236b98b37a35e9723033e627f97aa88b"); assert_blob_oid("refs/stash^3:just.ignore", "78925fb1236b98b37a35e9723033e627f97aa88b");
cl_assert(!git_path_exists("stash/just.ignore"));
} }
#define MESSAGE "Look Ma! I'm on TV!" #define MESSAGE "Look Ma! I'm on TV!"