Commit Briefs
move more code used by got-send-pack and got-fetch-pack to a common file
Move functions and data structures which implement Git protocol features required for fetching and sending pack files to new files lib/gitproto.c and lib/got_lib_gitproto.h. This code was duplicated in got-fetch-pack and got-send-pack. No functional change.
move pkt code used by got-fetch-pack and got-send-pack to a common file
The Git protocol uses a simple packet framing format. The got-fetch-pack and got-send-pack programs contained identical copies of functions to support this format. Move related functions to new file lib/pkt.c and link both programs against this common implementation. No functional change.
make "got branch -d" print reference name and value
Also silence output of "got branch -d" in a regression test, from stsp. ok stsp
fix 'got send' adding too many objects to the pack file in some cases
Load server-side tags before loading local commits. Otherwise objects which are reachable via server-side tags will not be filtered out.
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
remove ancestry sanity checks from 'got cherrypick' and 'got backout'
While these checks might catch usage mistakes the performance overhead of scanning the entire history of the current branch is not worth it. Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's src repository in usr.bin/rsync: Before: 5m50.33s real 4m02.36s user 2m04.41s system After: 1m04.92s real 0m28.24s user 0m36.54s system Further performance improvements could be needed but this is a first step.
fix bogus error when 'got cherrypick' merges changes into a locally added file
reported by + ok naddy
Update comment regarding the merged_paths list used by rebase and histedit
with insight I obtained while trying to make this idea work, and failing...
disable ignore lists during status walks used by rebase and histedit
Fixes rebase of gotwebd branch which added a new directory which is also matched by .gitignore rules on the branch.