Preparations for exceptions on git error (part 2) #9231
Merged
Conversation
This file contains 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
Occurs if: * core.safecrlf is warn or true * core.autocrlf is true on Windows * a file stored in crlf is edited to lf * File is selected in Diff tab
when init in Dashboard - without working dir, of course
gerhardol
approved these changes
May 23, 2021
gerhardol
reviewed
May 23, 2021
| @@ -1116,19 +1116,11 @@ public bool ExistsMergeCommit(string? startRev, string? endRev) | |||
| { | |||
| "--parents", | |||
| "--no-walk", | |||
| "--min-parents=2", | |||
There was a problem hiding this comment.
This option is available in Git 2.1 at least (but maybe not when the command was originally added?), so no version check required
RussKie
approved these changes
May 24, 2021
ghost
added this to the
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some of the preparations for #9056 contributed by @gerhardol
Proposed changes
occured if:
occurred when the ROT is initialized in the Dashboard without a working dir, of course
Screenshots
not affected
Test methodology
Test environment(s)
✒️ I contribute this code under The Developer Certificate of Origin.