Commit Briefs
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
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@
add missed option conflict check for histedit -e and -f
Reviewed as part of previous commit adding histedit -d. ok stsp@
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@
CHANGES for 0.83 (tags/0.83)
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@
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@
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
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
got.1: Mark the commit argument to cherrypick and backout optional
patch by Josiah Frentsos