Commit Briefs

661072277f Thomas Adam

embed got_object_id instead of SHA1 hashes in references

ok stsp@



58aedb1c92 Thomas Adam

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


f35e52a986 Thomas Adam

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@


54fdcaee61 Thomas Adam

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

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


070c80a59d Thomas Adam

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@


ed611b60fe Thomas Adam

update todo list


1156c6910d Thomas Adam

bump version number


cf5c27d11e Thomas Adam

CHANGES for 0.83


3f4f8b5a3d Thomas Adam

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@


6f12304bed Thomas Adam

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@



afe4b8089d Thomas Adam

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



630fc61f66 Thomas Adam

fix histedit -m on a commit which only changes filemode bits

The commit was being miscategorized as a no-op change and dropped. Now the commit is retained and its log message is updated as expected. ok op, jamsek




7e710171ff Thomas Adam

got.1: Mark the commit argument to cherrypick and backout optional

patch by Josiah Frentsos


c7d9bedcc6 Thomas Adam

abort commit with merged log messages if the log message is left unmodified

ok op@



8279ab8c66 Thomas Adam

rename a variable for clarity


52d3950d94 Thomas Adam

clarify documentation of cherrypick/backout log message recording

ok jamsek


46f8743694 Thomas Adam

uppercase cherrypick/backout -X progress output

ok jamsek


eb5dc07888 Thomas Adam

improve heuristics for prepopulated log messages

Small tweak to cover the case where users specify paths to be committed such that none of the paths modified by a backout or cherrypick operation are in the commit. In this case, the logmsg ref will remain in refs/got/worktree to be used when the user does run a commit involving the affected paths. ok stsp@


bb723b7a6c Thomas Adam

fix invalid assumption in commit_path_changed_in_worktree()

Make sure we have a parent id first to avoid dereferencing a NULL pointer with the got_object_open_as_commit() call. ok op@ and stsp@