Commit Briefs

b637f33f3d Mark Jamsek

fix OB1 in tog ref and tree views causing wrapped lines

While here, draw to the last column in tog help. ok op@ and stsp@


466be13875 Mark Jamsek

update backout/cherrypick regress for worktree UUID output

ok stsp@


ef85a376d8 Mark Jamsek

zap unused parameter in got_worktree_rebase_complete()

ok stsp@


36fdf00388 Mark Jamsek

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

ok stsp@


3506a2b1c2 Mark Jamsek

free cwd in cmd_backout() and cmd_cherrypick()

ok stsp@


2aea6fc2c2 Omar Polo

gotwebd: delete always-true check

ok stsp@


407521c004 Omar Polo

got_imsg_raw_delta: use struct instead of buffer for id

ok stsp@


babd9f5d19 Omar Polo

got_imsg_raw_delta_request: use struct instead of buffer for id

ok stsp@


d283eca617 Omar Polo

fmt


265df21f29 Omar Polo

got_imsg_packed_object: use struct instead of buffer for id

ok stsp@


980c6786a4 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


faf5b56f3a Omar Polo

embed got_object_id instead of SHA1 hashes in references

ok stsp@



26a981724a Stefan Sperling

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


b584caa3e8 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@


66c06eb12b Mark Jamsek

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

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


f1c9fe20d3 Mark Jamsek

got: add 'got histedit -d' flag to drop all commits

Like -f, except drop all commits. Discussed with op and stsp on irc. ok stsp@


d6669aa729 Stefan Sperling

update todo list


0ac460316e Stefan Sperling

bump version number


4718a153a9 Stefan Sperling

CHANGES for 0.83 (tags/0.83)


def2bea2b9 Mark Jamsek

regress: commit coverage for the new logmsg ref feature

This tests we correctly: - use multiple logmsg refs in one commit; - use only relevant refs involving affected paths; - use refs when some of the affected paths are reverted; - neither use nor remove refs if all affected paths are omitted from the commit; - use refs when previously excluded paths are later committed. - remove corresponding temp merged_log 'got-logmsg-*' files hints and ok stsp@


7e320d3b05 Mark Jamsek

got: don't leave tmp "got-logmsg-*" files in the work tree

Reported by stsp on irc, and reviewed as part of the following regress commit covering the commit aspect of logmsg refs. Delete temp merge_log files if created during commits involving backed-out/cherrypicked changes. ok stsp@



71a61c8ccc Stefan Sperling

use VISUAL instead of EDITOR in histedit_mesg_filemode_change

VISUAL is preferred and relying on EDITOR may cause test failures in some environments. pointed out by op and jamsek