Commits
- Commit:
5b87815ed2f346f81374261ce2d633feae711886
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent commits from being listed more than once in a histedit script
While merging a commit multiple times during a histedit operation could
potentially make sense in some corner case, a commit appearing more than
once in the script is more likely to happen accidentally.
If desired, the same effect can still be achieved by running multiple
histedit operations, or by using 'got cherrypick' while the histedit
operation is paused for arbitrary editing.
- Commit:
4cb8f8f3e6cc4a795c92823235070dd921c2b42e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix wrong use of words in a histedit error message
- Commit:
4b6c9460c99283f193f32bd5177bb09047abacf3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
be helpful when users try to check out work trees without a known branch
Provide a useful error message in such cases and explicitly document
intentional restrictions in the got(1) man page.
Prompted by a question from Adam Steen via bsd.network
https://bsd.network/@adams/103768951483318235
- Commit:
a0ea4fc07b81c69fa0409a2e39e702659f256179
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show merged commit ID + logmsg upon merge conflict during rebase and histedit
This makes it more apparent which commit contained the conflicting change.
The new output looks like this:
C sys/dev/pci/if_iwm.c
8a98d848a1a5 -> merge conflict: properly modify station queues
got: conflicts must be resolved before rebasing can continue
- Commit:
272a1371f13b6ed4076eb8f9ff4a910cd0a47ed7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don't leak logmsg in show_rebase_progress()
- Commit:
7ef62c4e3e891c47d0449ca61fcb3fa35a98ec51
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
disallow 'got rebase' while a histedit operation is in progress
- Commit:
80106605fef38d5bd94de493c3aa9ccdbcb9c8f8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch 'got tag' commit argument to a -c option for consistency
- Commit:
da76fce2dfde1786444285db2a03ddf14328c662
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
let 'got branch' switch and update the work tree
ok tracey
- Commit:
083957f4072e9d36c5c770055348c03850e63b30
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got histedit -m' option which makes it easy to edit log messages only
ok tracey
- Commit:
bb63914a95fa51c7f5dc16d02b8f4ae2736e2e15
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make tmp dir location a compile-time setting and change gotweb's tmp dir
We are not sure whether a gotweb package can own /var/www/tmp on OpenBSD.
Moving gotweb's tmp dir to /var/www/got/tmp sidesteps that issue.
- Commit:
a097512813331d3a6c5eac85579b195a9707f114
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got blame' and 'tog blame' on files added on worktree's current branch
- Commit:
c5996fffdf906ace91b9ec3e51dcb23eb806e187
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
perform the check for an empty histedit commit list earlier
- Commit:
ab20a43a2f9d75f0398a92f4d1f3eda36abb6d15
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don not open log message editor if there are no changes during 'histedit -c'
- Commit:
514f2ffeffbb309e061de0bb5232cd9e2dc3318a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
display branch name and first commit to be edited at top of histedit script
- Commit:
829974726320c65bc92c983b50e18de3daf703fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve wording of hint displayed for the histedit 'fold' command
- Commit:
f43793a4e6eda593d67d4872bc7f03398fbd65d9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a bug where 'got log PATH' failed to map PATH into the repository
The problem occured inside /usr/src/sys due to the /sys symlink,
where /usr/src was a got work tree. If a work tree is present we
already have the right path so checking the disk is pointless.
- Commit:
48c8c60d8b401706b7df49fd50a9d298728e8c7b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got log' show first-parent history by default; remove -f and add -b option
- Commit:
fb9704afe0e40de783660e26d5498278a47affca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not display unversioned files during 'got revert -R'
- Commit:
b55e96cf8f2e45d9a12689ad41d08d426e9715a5
- From:
- Martin Pieuchot <mpi@grenadille.net>
- Date:
Remove redundant error check after got_object_id_by_path().
An error code is always returned when the oid is NULL.
- Commit:
d1f166363b86f21241be730505c1182508dc9d2c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move got_repo_cmp_tags() to got_ref_cmp_tags()
- Commit:
2ddd470150cfe6f1d3d2d51858b13a0dc40ca601
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move cmp_tags() into the library
- Commit:
71a276322e39e17baf5697b5daac8e8fe6ad2ae1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move match_object_id() into the library; supersedes got_repo_resolve_commit_arg
- Commit:
7a1d6b72b6b0e351fb46965a7f46bc58b18e7cc8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'tog log -c' with tags
- Commit:
89a6c02f07041d4deb48c8556203105e8f2d5504
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
remove unneeded done jumps
- Commit:
562580bce8d701d318471fe7601bc614a00c94ef
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
support Git-style "lightweight" tags as arguments for 'got diff'