Merged
Conversation
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
See microsoft/git#251 for details. This required an update to our test infrastructure. The rebase merge backend changed in a way that it would now open an editor during `git rebase --continue`, causing a test to wait for `vim` to close. Set the editor to be a no-op. This also changes the output to include the commit oid, so use `GIT_COMMITTER_TIME` to be a constant to keep the commits the same.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Wow, this was really not working as expected. See microsoft/git#255 for how broken the `--expire-time` argument was. Fix this by using the fixed argument and passing a datetime instead of an offset by seconds. This will provide a longer window for old commit-graph files, but apparently we've been leaving turd files around for a long time without anyone noticing.
The 'gvfs mount' command will send a message over the named pipe to deactivate a repo. This marks it with "IsActive = false" so we don't try to mount it at service startup. However, a repo can be deleted and then there is no way to send this message again. Instead, ignore repositories where the enlistment root does not exist. Don't remove it from the registry, since there may be a subtle reason why it is not visible from the serivce (such as a removed USB drive). Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
…repos The 'gvfs mount' command will send a message over the named pipe to deactivate a repo. This marks it with "IsActive = false" so we don't try to mount it at service startup. However, a repo can be deleted and then there is no way to send this message again. Instead, ignore repositories where the enlistment root does not exist. Don't remove it from the registry, since there may be a subtle reason why it is not visible from the service (such as a removed USB drive). Resolves microsoft#1651.
This time with the correct version number. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Re-pushed to include the correct version number after pushing the v2.26.1.vfs.1.1 tag.
kewillford
approved these changes
Apr 15, 2020
jrbriggs
approved these changes
Apr 15, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Includes the following PRs:
The update to include Git v2.26.0 comes with a new default backend for
git rebase. By switching from theapplybackend to themergebackend, some rebase situations that would previously fail will now succeed automatically. This comes with a slight performance drawback, but it is the direction that the Git community has decided to go. Please see the Git documentation for more details.