Skip to content

Conversation

@benpeart
Copy link

In the reset --mixed code path, the index is created from scratch from the given commit by the call to read_from_tree(). Since this is the code that actually modifies the index, make sure we set the the_index.updated_skipworktree flag which is passed to the post-indexchanged hook.

Updated the post-index-changed-hook test script to pass the --quiet flag so that we can prevent future regressions.

Signed-off-by: Ben Peart benpeart@microsoft.com

…he post-indexchanged hook

In the reset --mixed code path, the index is created from scratch from the
given commit by the call to read_from_tree().  Since this is the code that
actually modifies the index, make sure we set the the_index.updated_skipworktree
flag which is passed to the post-indexchanged hook.

Updated the post-index-changed-hook test script to pass the --quiet flag
so that we can prevent future regressions.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
@benpeart benpeart merged commit e733dd7 into microsoft:vfs-2.20.0 Dec 13, 2018
derrickstolee pushed a commit that referenced this pull request Dec 17, 2018
update the reset --quiet path codepath to pass the correct flags to the post-indexchanged hook
dscho pushed a commit that referenced this pull request Feb 27, 2019
update the reset --quiet path codepath to pass the correct flags to the post-indexchanged hook
dscho pushed a commit that referenced this pull request Mar 29, 2019
update the reset --quiet path codepath to pass the correct flags to the post-indexchanged hook
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants