Commit Briefs

Mark Jamsek

update backout/cherrypick regress for worktree UUID output

ok stsp@

diff | patch | tree

Mark Jamsek

zap unused parameter in got_worktree_rebase_complete()

ok stsp@

diff | patch | tree

Mark Jamsek

return err instead of NULL in got.c:print_backup_ref()

ok stsp@

diff | patch | tree

Mark Jamsek

free cwd in cmd_backout() and cmd_cherrypick()

ok stsp@

diff | patch | tree

Omar Polo

gotwebd: delete always-true check

ok stsp@

diff | patch | tree

Omar Polo

got_imsg_raw_delta: use struct instead of buffer for id

ok stsp@

diff | patch | tree

Omar Polo

got_imsg_raw_delta_request: use struct instead of buffer for id

ok stsp@

diff | patch | tree

Omar Polo

fmt

diff | patch | tree

Omar Polo

got_imsg_packed_object: use struct instead of buffer for id

ok stsp@

diff | patch | tree

Stefan Sperling

make 'got rebase' work when the to-be-rebased branch has no parent commit

found by and ok op@, who also provided the test case

diff | patch | tree

Omar Polo

embed got_object_id instead of SHA1 hashes in references

ok stsp@

diff | patch | tree

Stefan Sperling

remove cherrypick/backout -l feature from TODO; has been implemented by jamsek

diff | patch | tree

Stefan Sperling

add an idea for 'got fetch' to the todo list

diff | patch | tree

Mark Jamsek

show worktree UUID in backout/cherrypick -l output

When run from the repository, display the UUID to help the user know which logmsg refs belong to which work tree. Also, use "backout" or "cherrypick" in the log message header to distinguish output from 'got log'. Suggested by stsp on irc. ok stsp@

diff | patch | tree

Mark Jamsek

add missed option conflict check for histedit -e and -f

Reviewed as part of previous commit adding histedit -d. ok stsp@

diff | patch | tree