Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork6.3k
Move git config/remote to gitrepo package and add global lock to resolve possible conflict when updating repository git config file#35151
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
30 commits Select commitHold shift + click to select a range
a38ff9a Move git config/remote to gitrepo package and add global lock to reso…
lunny2e69ad3 remove unnecessary change
lunny2f89a04 Fix bug
lunny183cde5 fix
wxiaoguang70ef126 fix
wxiaoguang98bc0df some improvements
lunny976df17 Merge branch 'lunny/fix_git_config_conflict' of github.com:lunny/gite…
lunny7a8fdc2 improvements
lunny869f3ae improvements
lunny6501cff Merge branch 'main' into lunny/fix_git_config_conflict
lunnyae3c338 Follow @wxiaoguang's suggestion
lunny00666bd Merge branch 'lunny/fix_git_config_conflict' of github.com:lunny/gite…
lunny38c19d2 update comment
lunnya9633fd follow wxiaoguang's suggestion
lunny578d82d Merge branch 'main' into lunny/fix_git_config_conflict
lunny8fffb1b Merge branch 'main' into lunny/fix_git_config_conflict
lunny661fa4f Merge branch 'lunny/fix_git_config_conflict' of github.com:lunny/gite…
lunny0b82431 Merge branch 'main' into lunny/fix_git_config_conflict
lunny5ec1088 Merge branch 'main' into lunny/fix_git_config_conflict
lunnyda34762 Merge branch 'main' into lunny/fix_git_config_conflict
lunny2e77047 Merge branch 'main' into lunny/fix_git_config_conflict
654304ca695 Update services/pull/compare.go
wxiaoguangb40e8fd rename function
lunnyfb2b02f follow wxiaoguang's suggestion
lunny60bcbe8 Merge branch 'main' into lunny/fix_git_config_conflict
lunny308bae0 Merge branch 'lunny/fix_git_config_conflict' of github.com:lunny/gite…
lunnycd9d095 Merge branch 'main' into lunny/fix_git_config_conflict
lunny7a25938 Merge branch 'main' into lunny/fix_git_config_conflict
GiteaBot0effe51 Merge branch 'main' into lunny/fix_git_config_conflict
lunnyd3dcab6 Merge branch 'lunny/fix_git_config_conflict' of github.com:lunny/gite…
lunnyFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
fix
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit183cde56e09af0ee7b9c3ba83f826873ff16091c
There are no files selected for viewing
11 changes: 9 additions & 2 deletionsmodules/git/repo.go
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
14 changes: 7 additions & 7 deletionsmodules/git/repo_commit.go
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
12 changes: 2 additions & 10 deletionsservices/pull/compare.go
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
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.