diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-11-03 21:08:38 +0100 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-21 05:19:28 +0100 |
commit | 70fe187f1e118b6e63e512b6718635561682dad4 (patch) | |
tree | 1ae04ed78cee3dee951400f7d99642f885ef4cd9 /apps/servers/octopus/supergit/src/raw/.#tree_walk.rs | |
parent | 8be6dc679e97053da8f173333578ed626466d3de (diff) |
octopus: refactoring & typed branch parsing
This code is work-in-progress, and doesn't work on a repo that has a
branched history. The issue here is that after handling a merge
commit, keeping track of which commit to look at next is non-trivial.
This solution tries to isuse a "skip" command on the walker, but this
can accidentally skip commits, when two merges have happened in
succession (maybe a bug with the impl, not the concept).
But also, the actual merge commit seems to already be part of the
norma history? So maybe we can ommit the merge commit explicitly, and
simply return a new branch handle instead.
Diffstat (limited to 'apps/servers/octopus/supergit/src/raw/.#tree_walk.rs')
l--------- | apps/servers/octopus/supergit/src/raw/.#tree_walk.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/servers/octopus/supergit/src/raw/.#tree_walk.rs b/apps/servers/octopus/supergit/src/raw/.#tree_walk.rs deleted file mode 120000 index a0d266615930..000000000000 --- a/apps/servers/octopus/supergit/src/raw/.#tree_walk.rs +++ /dev/null @@ -1 +0,0 @@ -spacekookie@qq.53166
\ No newline at end of file |