alpha
Login
or
Join now
dunkirk.sh
/
core
forked from
tangled.org/core
Star
0
Fork
0
Atom
Configure Feed
Issues
Pull Requests
Commits
Tags
Feed URL
Select the types of activity you want to include in your feed.
This repository has no description
Star
0
Fork
0
Atom
Configure Feed
Issues
Pull Requests
Commits
Tags
Feed URL
Select the types of activity you want to include in your feed.
Overview
Issues
Pulls
Pipelines
core
/
knotserver
/
git
/
at
master
1 folder
6 files
oppili.bsky.social
knotserver: use common ancestor to calculate diffs
1y ago
70a9bc2d
service
knotserver: git: fix upload-pack handling Fix stdin piping to git-upload-pack. I think we were closing the pipe too soon previously, resulting in the 'fatal: remote end hung up unexpectedly' error. Probably went unnoticed for smaller repos. Also fix a bunch of misc. bugs in with superfluous http header writes and the gzip reader being shadowed.
1 year ago
diff.go
knotserver: use common ancestor to calculate diffs the existing diff calculation approach directly compares branches, this forces linear history for merge. this patch updates the diff logic to use the common ancestor commit to calculate diffs. ``` P Q o---o topic / / o---o---o---o master A X Y ``` when diffing topic and master directly with difftree (Q and Y), the commits introduced in master since the creation of the branch, namely, X and Y, are considered "removed" from the generated patch. however, when diffing with the common ancestor A, only changes introduced by P and Q are included in the produced patch. this calculation can be retired in favor of format-patch soon enough (i think).
1 year ago
fork.go
knotserver: git: fix hiddenRef logic
1 year ago
git.go
add resubmit hints unless a branch is updated, resubmit will remain disabled; and when there are changes added to the branch, a hint is supplied.
1 year ago
merge.go
knotserver/git/merge: merge options use git apply
1 year ago
repo.go
set default branch from KNOT_REPO_MAIN_BRANCH
1 year ago
tree.go
knotserver: git: fetch last commit time against current plumbing.Hash This fixes the bug where paths wouldn't show up in non-default branches. We were running 'git log' against the bare repository that was pointing to the default branch, which would then return no output for that specific path since -- understandably -- the path doesn't exist on the default branch. This change simply passes the current g.h (plumbing.Hash) to 'git log' which resolves the path in that ref.
1 year ago