mirror of https://github.com/go-gitea/gitea.git
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
8598356df1
The merge and update branch code was previously a little tangled and had some very long functions. The functions were not very clear in their reasoning and there were deficiencies in their logging and at least one bug in the handling of LFS for update by rebase. This PR substantially refactors this code and splits things out to into separate functions. It also attempts to tidy up the calls by wrapping things in "context"s. There are also attempts to improve logging when there are errors. Signed-off-by: Andrew Thornton <art27@cantab.net> --------- Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: delvh <dev.lh@web.de> |
2 years ago | |
|---|---|---|
| .. | ||
| actions | 2 years ago | |
| activitypub | 2 years ago | |
| analyze | 2 years ago | |
| auth | 2 years ago | |
| avatar | 2 years ago | |
| base | 2 years ago | |
| cache | 2 years ago | |
| charset | 2 years ago | |
| container | 2 years ago | |
| context | 2 years ago | |
| csv | 2 years ago | |
| doctor | 2 years ago | |
| emoji | 2 years ago | |
| eventsource | 2 years ago | |
| generate | 2 years ago | |
| git | 2 years ago | |
| gitgraph | 2 years ago | |
| graceful | 2 years ago | |
| hcaptcha | 2 years ago | |
| highlight | 2 years ago | |
| hostmatcher | 2 years ago | |
| html | 2 years ago | |
| httpcache | 2 years ago | |
| httplib | 2 years ago | |
| indexer | 2 years ago | |
| issue/template | 2 years ago | |
| json | 2 years ago | |
| label | 2 years ago | |
| lfs | 2 years ago | |
| log | 2 years ago | |
| markup | 2 years ago | |
| mcaptcha | 2 years ago | |
| metrics | 2 years ago | |
| migration | 2 years ago | |
| mirror | 2 years ago | |
| nosql | 2 years ago | |
| notification | 2 years ago | |
| options | 2 years ago | |
| packages | 2 years ago | |
| paginator | 2 years ago | |
| pprof | 2 years ago | |
| private | 2 years ago | |
| process | 2 years ago | |
| proxy | 2 years ago | |
| proxyprotocol | 2 years ago | |
| public | 2 years ago | |
| queue | 2 years ago | |
| recaptcha | 2 years ago | |
| references | 2 years ago | |
| regexplru | 2 years ago | |
| repository | 2 years ago | |
| secret | 2 years ago | |
| session | 2 years ago | |
| setting | 2 years ago | |
| sitemap | 2 years ago | |
| ssh | 2 years ago | |
| storage | 2 years ago | |
| structs | 2 years ago | |
| svg | 2 years ago | |
| sync | 2 years ago | |
| system | 2 years ago | |
| templates | 2 years ago | |
| test | 2 years ago | |
| timeutil | 2 years ago | |
| translation | 2 years ago | |
| turnstile | 2 years ago | |
| typesniffer | 2 years ago | |
| updatechecker | 2 years ago | |
| upload | 2 years ago | |
| uri | 2 years ago | |
| user | 2 years ago | |
| util | 2 years ago | |
| validation | 2 years ago | |
| watcher | 2 years ago | |
| web | 2 years ago | |
| webhook | 2 years ago | |