Commits
- Commit:
980c6786a419950816c67eb1b53e021ebdfe483c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
faf5b56f3ad3ab701a16b6684c5f936210ff86f8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
embed got_object_id instead of SHA1 hashes in references
ok stsp@
- Commit:
0d98195bc8c97f44f5635b97b8020dd934f677f0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove cherrypick/backout -l feature from TODO; has been implemented by jamsek
- Commit:
26a981724a075064c8bfecd157766766b31fe330
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add an idea for 'got fetch' to the todo list
- Commit:
b584caa3e8756aeac18e4d5b3c63cdc8b17ad9ea
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
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@
- Commit:
66c06eb12bec7b816963355327e0b3b53db5e881
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
add missed option conflict check for histedit -e and -f
Reviewed as part of previous commit adding histedit -d.
ok stsp@
- Commit:
f1c9fe20d35f9b64cee89491805039b13c91c8de
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
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@
- Commit:
d6669aa7295427afff77c3466009e1d56a223644
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update todo list
- Commit:
0ac460316edd80f927972d909ad8ecffb5846c0f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
4718a153a92948b27a3f1157f9f52eea99634569
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.83
- Commit:
def2bea2b9b5f351896e4af5c7ff6a59a1b537c9
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
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@
- Commit:
7e320d3b050a09132d29db243fa3940d96707346
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
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@
- Commit:
c167432e009e807556a97fe8c2c74362a726e9a7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
gotsh.1: show how to set up anonymous public read-only repository access
- Commit:
71a61c8ccc19248c397974fbd63b952d2665771c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
9f31ca1f0edf2d4791f35577d55fc5775fff871b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify file content comparison in a regress test; suggested by op@
- Commit:
c48f94a406682029fa132ede24321b2622641970
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
e14cd6566af60e94a5ce21d84d3fa21932466dc7
- From:
- Omar Polo <op@omarpolo.com>
- Date:
remove TODO item regarding 'got send -d' support in gotd
- Commit:
8bf76af3f358c0ad73a45348c76647955efc78e8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: editing merged log messages is no longer optional, tweak related wording
- Commit:
555f1fe02608935b41d521bc76d298526e916229
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: Mark the commit argument to cherrypick and backout optional
patch by Josiah Frentsos
- Commit:
cf847b167995f9c334ac203d4817d0203a222756
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
abort commit with merged log messages if the log message is left unmodified
ok op@
- Commit:
c7ee7a0aebd0cf0ba96bd4215bd263d8f1dd8e6b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid creation of temporary file if no merged log messages will be used
- Commit:
8b3ae425fe39895d4f5d1be49b178703173e964d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename a variable for clarity
- Commit:
4c16511c12ddf2bf3af298a4b6cd295ff1ba1bd1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
clarify documentation of cherrypick/backout log message recording
ok jamsek
- Commit:
378a2540886d76e663ffc65125a68c08f8a38604
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
uppercase cherrypick/backout -X progress output
ok jamsek
- Commit:
3d800fb8c5236335129e5a017113967bda6cd62c
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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@