Update Git to v2.26.0 #349
Merged
Conversation
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
30545ca to
e9abc8c
Compare
kewillford
approved these changes
Mar 17, 2020
2ee5918 to
75b632d
Compare
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
It appears that a behavior change in Git is causing the editor to be opened after a rebase conflict. Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Before, we would copy samples from the .git/hooks/ directory, but that relies on the timing of when a user initialized their repository. Further, the .git directory is less safe than the place where Git is installed. This new mechanism allows us to upgrade the fsmonitor hook automatically with new Git updates. Also update core.fsmonitorHookVersion to 2 explicitly. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
debad24 to
3ff3023
Compare
derrickstolee
added a commit
to derrickstolee/scalar
that referenced
this pull request
Mar 27, 2020
In microsoft#349, we updated where the hooks were being copied from. Instead of the local .git/hooks directory, we copy from the installed templates directory. This allowws us to grab the latest hook associated with our Git version. However, I neglected testing thoroughly on Mac, and the path was not rooted. This causes the config step to log an error because the path starts at the current working directory, not from root. Adjust the ConfigStep to return a 'false' result when this step fails, which will cause the RunVerbTests to fail if we cannot set the hook as expected. The test does not verify the hook is placed because we only place it if Watchman is installed. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
added a commit
to derrickstolee/scalar
that referenced
this pull request
Mar 27, 2020
In microsoft#349, we updated where the hooks were being copied from. Instead of the local .git/hooks directory, we copy from the installed templates directory. This allowws us to grab the latest hook associated with our Git version. However, I neglected testing thoroughly on Mac, and the path was not rooted. This causes the config step to log an error because the path starts at the current working directory, not from root. Adjust the ConfigStep to return a 'false' result when this step fails, which will cause the RunVerbTests to fail if we cannot set the hook as expected. The test does not verify the hook is placed because we only place it if Watchman is installed. However, we still have an issue with this approach, because our Git installer does not update the templates directory correctly! We do not include the v2 fsmonitor hook. Instead, use the raw hook data. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
added a commit
to derrickstolee/scalar
that referenced
this pull request
Mar 27, 2020
In microsoft#349, we updated where the hooks were being copied from. Instead of the local .git/hooks directory, we copy from the installed templates directory. This allowws us to grab the latest hook associated with our Git version. However, I neglected testing thoroughly on Mac, and the path was not rooted. This causes the config step to log an error because the path starts at the current working directory, not from root. Adjust the ConfigStep to return a 'false' result when this step fails, which will cause the RunVerbTests to fail if we cannot set the hook as expected. The test does not verify the hook is placed because we only place it if Watchman is installed. Also, I noticed that the templates directory was wrong! Our installer puts the templates in a different place than another version of Git. Perhaps that version was installed by XCode or something, but that caused the confusion. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
added a commit
to derrickstolee/scalar
that referenced
this pull request
Mar 28, 2020
In microsoft#349, we updated where the hooks were being copied from. Instead of the local .git/hooks directory, we copy from the installed templates directory. This allowws us to grab the latest hook associated with our Git version. However, I neglected testing thoroughly on Mac, and the path was not rooted. This causes the config step to log an error because the path starts at the current working directory, not from root. Adjust the ConfigStep to return a 'false' result when this step fails, which will cause the RunVerbTests to fail if we cannot set the hook as expected. The test does not verify the hook is placed because we only place it if Watchman is installed. Also, I noticed that the templates directory was wrong! Our installer puts the templates in a different place than another version of Git. Perhaps that version was installed by XCode or something, but that caused the confusion. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
added a commit
to derrickstolee/scalar
that referenced
this pull request
Mar 28, 2020
In microsoft#349, we updated where the hooks were being copied from. Instead of the local .git/hooks directory, we copy from the installed templates directory. This allowws us to grab the latest hook associated with our Git version. However, I neglected testing thoroughly on Mac, and the path was not rooted. This causes the config step to log an error because the path starts at the current working directory, not from root. Adjust the ConfigStep to return a 'false' result when this step fails, which will cause the RunVerbTests to fail if we cannot set the hook as expected. The test does not verify the hook is placed because we only place it if Watchman is installed. Also, I noticed that the templates directory was wrong! Our installer puts the templates in a different place than another version of Git. Perhaps that version was installed by XCode or something, but that caused the confusion. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
added a commit
that referenced
this pull request
Mar 28, 2020
…k location In #349, we updated where the hooks were being copied from. Instead of the local .git/hooks directory, we copy from the installed templates directory. This allowws us to grab the latest hook associated with our Git version. However, I neglected testing thoroughly on Mac, and the path was not rooted. This causes the config step to log an error because the path starts at the current working directory, not from root. Adjust the ConfigStep to return a 'false' result when this step fails, which will cause the RunVerbTests to fail if we cannot set the hook as expected. The test does not verify the hook is placed because we only place it if Watchman is installed. Also, I noticed that the templates directory was wrong! Our installer puts the templates in a different place than another version of Git. Perhaps that version was installed by XCode or something, but that caused the confusion. (Replaced #359)
chrisd8088
added a commit
to chrisd8088/scalar
that referenced
this pull request
Sep 20, 2020
In commit cbf6f82 in PR microsoft#349 the ValidateGitCommand() helper function was refactored slightly to use a new LinesShouldMatch() function; however, the inputs were accidentally reversed, so here we correct the order of the expected and actual string argments to LinesShouldMatch().
chrisd8088
added a commit
to chrisd8088/scalar
that referenced
this pull request
Sep 21, 2020
In commit cbf6f82 in PR microsoft#349 the ValidateGitCommand() helper function was refactored slightly to use a new LinesShouldMatch() function; however, the inputs were accidentally reversed, so here we correct the order of the "expected" and "actual" string arguments passed to LinesShouldMatch().
chrisd8088
added a commit
to chrisd8088/scalar
that referenced
this pull request
Sep 21, 2020
In commit cbf6f82 in PR microsoft#349 the ValidateGitCommand() helper function was refactored slightly to use a new LinesShouldMatch() function; however, the inputs were accidentally reversed, so here we correct the order of the "expected" and "actual" string arguments passed to LinesShouldMatch().
chrisd8088
added a commit
to chrisd8088/scalar
that referenced
this pull request
Sep 22, 2020
In commit cbf6f82 in PR microsoft#349 the ValidateGitCommand() helper function was refactored slightly to use a new LinesShouldMatch() function; however, the inputs were accidentally reversed, so here we correct the order of the "expected" and "actual" string arguments passed to LinesShouldMatch().
chrisd8088
added a commit
to chrisd8088/scalar
that referenced
this pull request
Sep 27, 2020
In commit cbf6f82 in PR microsoft#349 the ValidateGitCommand() helper function was refactored slightly to use a new LinesShouldMatch() function; however, the inputs were accidentally reversed, so here we correct the order of the "expected" and "actual" string arguments passed to LinesShouldMatch().
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
See microsoft/git#251 for details.
A few reaction items needed to happen:
git rebase --continueto open an editor if the commit had conflicts. By changingcore.editor=true, we can no-op the editor portion instead of running forever with an openvieditor.GIT_COMMITTER_DATEto be constant to avoid this problem.fsmonitorhook version was updated, so we need to update our hook along with Git. By copying from the templates directory instead of the samples initialized in.git/hooks, we are future-proof and will always get the latest copy recommended by Git. Resolves Install hooks from Scalar installed components #301.