Commit Briefs

Christian Weisgerber

make "got branch -d" print reference name and value

Also silence output of "got branch -d" in a regression test, from stsp. ok stsp

diff | patch | tree

Christian Weisgerber

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

ok tracey

diff | patch | tree

Christian Weisgerber

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

ok stsp

diff | patch | tree

Stefan Sperling

bump version number

diff | patch | tree

Stefan Sperling

changes for 0.57 (tags/0.57)

diff | patch | tree

Stefan Sperling

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.

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

limit checks for merge conflicts to files affected by the merge

Performance problems reported by naddy

diff | patch | tree

Christian Weisgerber

sys/param.h is not needed

diff | patch | tree

Stefan Sperling

plug a memory leak in check_merge_ok()

diff | patch | tree

Stefan Sperling

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.

diff | patch | tree

Stefan Sperling

fix bogus error when 'got cherrypick' merges changes into a locally added file

reported by + ok naddy

diff | patch | tree

Christian Weisgerber

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

ok tracey stsp

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all

diff | patch | tree

Stefan Sperling

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.

diff | patch | tree

Stefan Sperling

fix test data directory name used by test_histedit_fold_add_delete

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

ok naddy

diff | patch | tree

Christian Weisgerber

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

diff | patch | tree

Christian Weisgerber

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

diff | patch | tree

Stefan Sperling

remove superfluous strdup(3) from parse.y files; Patch by Martin Vahlensieck

diff | patch | tree

Stefan Sperling

bump version number

diff | patch | tree