Commits


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.


tog: when jumping to the bottom of the log view, go from the tail backwards ok jasper


make "got branch -d" print reference name and value Also silence output of "got branch -d" in a regression test, from stsp. ok stsp


tog: jump directly to first log item instead of traversing the list ok tracey


tog: add support for navigating to first/last line of tree and ref views ok stsp


bump version number


changes for 0.57


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.


add test which covers a cherrypick merge from a branch to itself


add a test case which covers 'got cherrypick' in a mixed-commit work tree


limit checks for merge conflicts to files affected by the merge Performance problems reported by naddy


sys/param.h is not needed


plug a memory leak in check_merge_ok()


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


tog: add support for navigating to first/last line of blame view ok tracey stsp


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...


backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all


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.


fix test data directory name used by test_histedit_fold_add_delete


Fix ksh completion example to complete the first arg only; from Clint Pachl


refactor collect_commitables() to make it easier to call from elsewhere later


make 'got send' heed the branch {} options in got.conf(5); they were ignored ok naddy


use the POSIX-compliant "date -u" command to return UTC time; ok stsp


"got blame" now shows UTC dates, adapt regression test; ok stsp