Commits
- Commit:
630fc61f66dc259068303613f6f3cfc39f1d267f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
5d0e507d72eb3e7e37b2117812bbc39c7852b22d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove TODO item regarding 'got send -d' support in gotd
- Commit:
95e6f77e2d30d9c6339f365844d53501d9f07daf
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: editing merged log messages is no longer optional, tweak related wording
- Commit:
7e710171ff462556367f78cf01da0ca2b0dca532
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got.1: Mark the commit argument to cherrypick and backout optional
patch by Josiah Frentsos
- Commit:
c7d9bedcc682ecd8d2276eec2a87a2fd4072388e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
abort commit with merged log messages if the log message is left unmodified
ok op@
- Commit:
beb452e226a6110ef7ace94ab1c804f8e5287e04
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
avoid creation of temporary file if no merged log messages will be used
- Commit:
8279ab8c66b2cff381b52f3b30118c624c93088f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
rename a variable for clarity
- Commit:
52d3950d946675a5906325e0b89bda875160ff4c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
clarify documentation of cherrypick/backout log message recording
ok jamsek
- Commit:
46f87436943043a275185ab51e86b849d9f27229
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
uppercase cherrypick/backout -X progress output
ok jamsek
- Commit:
eb5dc07888e8e878e5ef3fa2cf3ee77c4e902d13
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
bb723b7a6cfcf6937e16863096b630f9d5b324b1
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
a9020babcc81b07cd3b2a94d3a79b0e4af588a34
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
extend test_delete_branch
- try to delete using git
- try to delete multiple branches in one go
- verify the ref-list reported by the server before and after
the deletion
suggested / ok stsp
- Commit:
49563dfbdbb8d9325ae207c0b1400dc6939fef40
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotd: implement the delete-refs capability
Allow clients to run "got send -d" against gotd. Clients will send a
zero-id as new id for a reference and, in the special but more common
case of just deleting and not updating, no pack file will be sent.
ok and tweaks by stsp@
- Commit:
7c82d1d5588eee8ccc87b8258d5aa8d59f460a68
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress for new backout/cherrypick logmsg references
Tests only cover the -lX interface to list and delete logmsg refs created
by previous backout and cherrypick operations. Further tests are needed
for revert and commit coverage to ensure that the correct log messages of
bo/cy commits are loaded into the editor when 'got commit' is run, and that
only the refs used to populate the editor for the new commit are deleted.
Potential printf issues observed by op remain in the diff; noted here as a
reminder to do a sweep at some point in the future as there are other such
instances in cherrypick.sh and possibly elsewhere in regress.
Reviewed as part of previous commit introducing logmsg ref support for
backed-out/cherrypicked commits.
ok stsp@
- Commit:
f6cd0243250112471da1212a1549007367cc32a7
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
4838433d00607366f402318638f8d096a35ad012
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
up the checkout regress ulimit to 33, to accomodate for sparc64 failing at 32. ok stsp
- Commit:
5cc15b7b039c7dd0cf91c1c4578d2916479b24ef
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add TODO item for a histedit -m bug I have run into
- Commit:
e17294f7d5e2865bd321c133f76d9d4a9e8e44ea
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove \n from log message
- Commit:
0df2f4da548c03b7be3032d09620f7ab13daf62d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
delete trailing whitespaces
- Commit:
822aa840f7ea5462378efd3cc4d908c8323ea595
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add another pre-commit check idea to the gotd TODO list
- Commit:
47f028303ca0cb504743f84d2658e815f23ae53b
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
avoid traversing enumerated commits more than once in got-read-pack
Keep track of parent commits that will be processed as part
of looping over the commit queue provided by the main process,
and do not add these commits to the queue again.
Fixes pointless traversal of commits on the queue which will
simply be skipped. The end result is the same either way.
ok tracey
- Commit:
4088ab23bf2d330dc66483a747e0efb6c185eed8
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix missing commits in pack files created with packed object enumeration
got-read-pack forgot to send a tree-enumeration-done message to the
main process if the tree of a given commit had already been traversed.
The main process would then not add the corresponding commit to the
pack file, even though it should be added.
Found while using 'got send' towards gotd in order to populate an
empty repository on the server with non-trivial history, where some
commits always ended up missing due to this bug.
ok tracey
- Commit:
d4becbee8b30bfddd42b47a5d8cc47e3cfbc7077
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
cmd_tag: avoid unnecessary strdup of signer_id
ok jrick
- Commit:
717bfe1fc5d8b17816b1976027e99de75e670213
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: set next version
- Commit:
0c3124f53a5c7f280d51f7e0c02fafbdca778d83
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: release 0.82