mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-29 11:20:42 +00:00
b8270240bf
Fixes #22236
---
Error occurring currently while trying to revert commit using read-tree
-m approach:
> 2022/12/26 16:04:43 ...rvices/pull/patch.go:240:AttemptThreeWayMerge()
[E] [63a9c61a] Unable to run read-tree -m! Error: exit status 128 -
fatal: this operation must be run in a work tree
> - fatal: this operation must be run in a work tree
We need to clone a non-bare repository for `git read-tree -m` to work.
bb371aee6e
adds support to create a non-bare cloned temporary upload repository.
After cloning a non-bare temporary upload repository, we [set default
index](https://github.com/go-gitea/gitea/blob/main/services/repository/files/cherry_pick.go#L37)
(`git read-tree HEAD`).
This operation ends up resetting the git index file (see investigation
details below), due to which, we need to call `git update-index
--refresh` afterward.
Here's the diff of the index file before and after we execute
SetDefaultIndex: https://www.diffchecker.com/hyOP3eJy/
Notice the **ctime**, **mtime** are set to 0 after SetDefaultIndex.
You can reproduce the same behavior using these steps:
```bash
$ git clone https://try.gitea.io/me-heer/test.git -s -b main
$ cd test
$ git read-tree HEAD
$ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00
error: Entry '1' not uptodate. Cannot merge.
```
After which, we can fix like this:
```
$ git update-index --refresh
$ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00
```
678 lines
10 KiB
YAML
678 lines
10 KiB
YAML
# See models/unit/unit.go for the meaning of the type
|
|
-
|
|
id: 1
|
|
repo_id: 1
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 2
|
|
repo_id: 1
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 3
|
|
repo_id: 1
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 4
|
|
repo_id: 1
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 5
|
|
repo_id: 1
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 6
|
|
repo_id: 3
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 7
|
|
repo_id: 3
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":false,\"AllowOnlyContributorsToTrackTime\":false}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 8
|
|
repo_id: 3
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowRebaseMerge\":true,\"AllowSquash\":false}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 9
|
|
repo_id: 3
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 10
|
|
repo_id: 3
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 11
|
|
repo_id: 31
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 12
|
|
repo_id: 33
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1535593231
|
|
|
|
-
|
|
id: 13
|
|
repo_id: 33
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 1535593231
|
|
|
|
-
|
|
id: 14
|
|
repo_id: 33
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}"
|
|
created_unix: 1535593231
|
|
|
|
-
|
|
id: 15
|
|
repo_id: 33
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 1535593231
|
|
|
|
-
|
|
id: 16
|
|
repo_id: 33
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 1535593231
|
|
|
|
-
|
|
id: 17
|
|
repo_id: 4
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 18
|
|
repo_id: 4
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 19
|
|
repo_id: 4
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 20
|
|
repo_id: 4
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 21
|
|
repo_id: 4
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 22
|
|
repo_id: 2
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 23
|
|
repo_id: 2
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 24
|
|
repo_id: 2
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 25
|
|
repo_id: 32
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 26
|
|
repo_id: 32
|
|
type: 2
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 27
|
|
repo_id: 24
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 28
|
|
repo_id: 24
|
|
type: 2
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 29
|
|
repo_id: 16
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 30
|
|
repo_id: 23
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 31
|
|
repo_id: 27
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 32
|
|
repo_id: 28
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 33
|
|
repo_id: 36
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 34
|
|
repo_id: 36
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 35
|
|
repo_id: 36
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 36
|
|
repo_id: 36
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 37
|
|
repo_id: 36
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 1524304355
|
|
|
|
-
|
|
id: 38
|
|
repo_id: 37
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 39
|
|
repo_id: 37
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 40
|
|
repo_id: 37
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 41
|
|
repo_id: 37
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 42
|
|
repo_id: 37
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 43
|
|
repo_id: 38
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 44
|
|
repo_id: 38
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 45
|
|
repo_id: 38
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 46
|
|
repo_id: 39
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 47
|
|
repo_id: 39
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 48
|
|
repo_id: 39
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 49
|
|
repo_id: 40
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 50
|
|
repo_id: 40
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 51
|
|
repo_id: 40
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 52
|
|
repo_id: 41
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 53
|
|
repo_id: 41
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 54
|
|
repo_id: 41
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 55
|
|
repo_id: 10
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 56
|
|
repo_id: 10
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 57
|
|
repo_id: 10
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 58
|
|
repo_id: 11
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 59
|
|
repo_id: 42
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 60
|
|
repo_id: 42
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 61
|
|
repo_id: 42
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 62
|
|
repo_id: 42
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 63
|
|
repo_id: 42
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 64
|
|
repo_id: 44
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 65
|
|
repo_id: 45
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 66
|
|
repo_id: 46
|
|
type: 7
|
|
config: "{\"ExternalTrackerURL\":\"https://tracker.com\",\"ExternalTrackerFormat\":\"https://tracker.com/{user}/{repo}/issues/{index}\",\"ExternalTrackerStyle\":\"\"}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 67
|
|
repo_id: 47
|
|
type: 7
|
|
config: "{\"ExternalTrackerURL\":\"https://tracker.com\",\"ExternalTrackerFormat\":\"https://tracker.com/{user}/{repo}/issues/{index}\",\"ExternalTrackerStyle\":\"numeric\"}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 68
|
|
repo_id: 48
|
|
type: 7
|
|
config: "{\"ExternalTrackerURL\":\"https://tracker.com\",\"ExternalTrackerFormat\":\"https://tracker.com/{user}/{repo}/issues/{index}\",\"ExternalTrackerStyle\":\"alphanumeric\"}"
|
|
created_unix: 946684810
|
|
-
|
|
id: 69
|
|
repo_id: 2
|
|
type: 2
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 70
|
|
repo_id: 5
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 71
|
|
repo_id: 5
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 72
|
|
repo_id: 5
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 73
|
|
repo_id: 5
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 74
|
|
repo_id: 5
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 75
|
|
repo_id: 1
|
|
type: 8
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 76
|
|
repo_id: 2
|
|
type: 8
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 77
|
|
repo_id: 3
|
|
type: 8
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 78
|
|
repo_id: 50
|
|
type: 2
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 79
|
|
repo_id: 51
|
|
type: 2
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 80
|
|
repo_id: 53
|
|
type: 1
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 81
|
|
repo_id: 54
|
|
type: 1
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 82
|
|
repo_id: 31
|
|
type: 1
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 83
|
|
repo_id: 31
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 84
|
|
repo_id: 56
|
|
type: 1
|
|
created_unix: 946684810
|
|
-
|
|
id: 85
|
|
repo_id: 57
|
|
type: 1
|
|
created_unix: 946684810
|
|
-
|
|
id: 86
|
|
repo_id: 57
|
|
type: 2
|
|
created_unix: 946684810
|
|
-
|
|
id: 87
|
|
repo_id: 57
|
|
type: 3
|
|
created_unix: 946684810
|
|
-
|
|
id: 88
|
|
repo_id: 57
|
|
type: 4
|
|
created_unix: 946684810
|
|
-
|
|
id: 89
|
|
repo_id: 57
|
|
type: 5
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 90
|
|
repo_id: 52
|
|
type: 1
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 91
|
|
repo_id: 58
|
|
type: 1
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 92
|
|
repo_id: 58
|
|
type: 2
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 93
|
|
repo_id: 58
|
|
type: 3
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 94
|
|
repo_id: 58
|
|
type: 4
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 95
|
|
repo_id: 58
|
|
type: 5
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 96
|
|
repo_id: 49
|
|
type: 1
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 97
|
|
repo_id: 49
|
|
type: 2
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 98
|
|
repo_id: 1
|
|
type: 8
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 99
|
|
repo_id: 1
|
|
type: 9
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 100
|
|
repo_id: 1
|
|
type: 10
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 101
|
|
repo_id: 59
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|