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

avoid creation of temporary file if no merged log messages will be used

rename a variable for clarity

uppercase cherrypick/backout -X progress output ok jamsek

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@

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@

got: load editor with backout/cherrypick commit log messages Create new logmsg references used to populate the editor with the log messages of backed-out and cherrypicked commits when 'got commit' is run. We use versioned path state heuristics during revert and commit commands in an effort to ensure the editor is only populated with the log messages of backed-out and/or cherrypicked commits involving paths with local changes that are being committed. This is an implementation of an initial idea and algorithm designed by stsp. inputs, improvments and ok stsp@

cmd_tag: avoid unnecessary strdup of signer_id ok jrick

got merge: call the right usage_*() function Diff from Mikhail, thanks!

got: don't leak pathlist in commit and revert commands ok stsp@

refactor got log -d and tog diffstat to compute diff once This eliminates the previous performance cost by making 'got log -d' and tog diff view compute the diffstat while building the diff in a temp file like we do with 'got diff -d'. Also, keep the current 'got log -d' UI as per stsp's suggestion. ok stsp@

don't use plural noun after 1 in diffstat total Use singular form when appropriate; for example, turn the top into the bottom: 1 file changed, 1 insertions(+), 1 deletions(-) 1 file changed, 1 insertion(+), 1 deletion(-) ok op@

got: set error on asprintf() failure ok op@

catch a few missed got_pathlist_append() error checks ok stsp@

got: zap dead variable in add_branch() ok stsp@ op@