Commits
- Commit:
68036464ea72a92fd21d72135814faed6abad71a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
allow start_pack_privsep_child() to be called from outside lib/object.c
- Commit:
9b4458b41088db703d890881c32dfd242efce4df
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
- Commit:
ef20f542049f5928fa256eb470801089d0b1048b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
build with -Wmissing-prototypes
ok stsp@
- Commit:
ef0b17aa7b1ff2b4dd0c2ee7b2e28eb5cd3b47c8
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: move FreeBSD capsicum header
This tidies up an #include required for capsicum on FreeBSD -- as its
inclusion on FreeBSD is unconditional, but masking out cap_enter() on
non-FreeBSD systems isn't.
No functional change -- it's just cosmetic.
- Commit:
dc8f2a0ce7c8c9ac58d8651a836e331d6c38cefb
- From:
- Omar Polo <op@omarpolo.com>
- Date:
delete a few binary files added by mistake
- Commit:
48d12d85613defb1cd51d5edac71afeb7f283244
- From:
- Omar Polo <op@omarpolo.com>
- Date:
repopulate .gitignore, revert 78c05fa
Probably due to a rebase, 78c05fa ended up truncating most of the
portable .gitignore. Reinstate it with some small tweaks and add
got-read-patch while here.
- Commit:
f6f9756590aafd0df5b48fdecc448a3806162211
- From:
- Omar Polo <op@omarpolo.com>
- Date:
mention the cross-compilation fix
- Commit:
3c79ece5dbd0a468b7de189d359be7a969275026
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add -q to all the regress scripts
- Commit:
5d120ea8410ddc2808e476d554ba931dc19d8c50
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use capsicum on FreeBSD
Thanks to the design of Got, the libexec helpers don't need any resource
(in fact they run under pledge "stdio recvfd" on OpenBSD) and so using
cap_enter(2) on FreeBSD is dead-easy.
While the main process can't be sandboxed on FreeBSD (needs to exec the
helpers), all the tough work is done by these small libexec helpers
which is also the biggest attack surface.
tested by naddy, ok thomas
- Commit:
f620ae20ad85d852b04f084cdb86549ee4fff1bb
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: set next version
- Commit:
c22fe1e8698a5a1ce97cb4bd7624f73b0bd7aa6b
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: CHANGELOG for 0.71
This updates the CHANGELOG for the 0.71 commit.
- Commit:
07b0611c8456de69c5928e2e11cdc7c6ad204912
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: prefix mvmt keymaps with count modifier like vi(1)
Enable compound commands for all movement keymaps (e.g., hjkl, bfdu). The
optional prefixed count determines how many times the movement is performed;
for example, '123j' (move 123 lines down) or '4f' (scroll 4 pages down).
Counts are ignored if preceding non-movement and some singular movement
operations (e.g., 't', 'r', 'ret', '/', '$', 'G', 'g').
ok stsp@
- Commit:
762b8e82159007814bc0eaacebf8c2ff2ad34cb5
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: use status G for merged files (and document it)
Suggested by stsp@. This makes possible to tell if 'got patch' used a
merge-base from the repository for the 3-way merge or did a simple
search/replace operation.
While here update the tests to look for the 'G' status and the manpage,
which was also missing the documentation for the 'C' status in got
patch.
ok stsp@
- Commit:
c9a4f4fa65c4e3f4457190460a0b3ec4c50c8d4d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: ignore blobs not found
since diffs are often enclosed in other formats (e.g. emails) we might
parse something and think it's a blob id when it's not. This should
already happens, but apply_patch is looking for the wrong error due to a
leftover from previous attempts. Reported by stsp@
while here tweak the test_patch_merge_unknown_blob to also try with a
dummy commit id, as now got-read-patch requires it in order to consider
a blob id.
ok stsp@
- Commit:
748b46b9f4f7af3736a2bdc81e204d250a56b3c7
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix `limit' accounting in draw_commit
if the child view is fullscreen we don't need to subtract one, because
no vborder is drawn.
ok Mark Jamsek
- Commit:
4c2d69cb280249e1deaae9699e989795509029e3
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: make SPACE page down in all views
ok op@, Mark Jamsek
- Commit:
b65b3ea056c6456b6b335189af016235a22c2515
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix fullscreen view regression introduced in 0dbbbe90fd
When cycling from a child view in fullscreen, the parent view is opened in
a splitscreen with no border instead of fullscreen. Check the view mode when
cycling between views and resize parent dimensions accordingly.
ok op@
- Commit:
1c5e5faa6333a09f54d94e18818547ae55f433f7
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
alias C-b/C-f to scroll page back/forward with b/f
Suggested by naddy. Remap 'f'ullscreen to 'F', and blame view key maps 'b' and
'B' to 'c' and 'C', respectively, per stsp's and naddy's suggestion. While
here, remove trailing whitespace.
ok naddy@
- Commit:
016bfe4bc2e2f43aea446f3c89e1539235c66fd2
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use the commitid in the patch diff3 conflict header
suggested by and ok stsp@
- Commit:
0f76ab831bc589bb34a4953cf60c8a05a4ed708c
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: use diff3 to merge the changes
Parse the "blob -" metadata in diffs produced by 'got diff' and use the
original file for patching. Then, use the diff3 with the current
version of the file to merge the differences.
This solves many failures automagically or at least turns them into a
conflict.
ok/improvements stsp@
- Commit:
2d9b683740176cd3223b23ca8bed498f87c0ecbc
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
patch_file: fill tmp with the patched file even in nop mode
future work with diff3 merge will need the fully patched file even in
the nop mode
ok stsp@
- Commit:
2249fadd87cf34f5a23846a876e1a846a82c5c79
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
patch_file: move file ownership to parent
ok stsp@
- Commit:
e16a78c2dd0580573c8bff15d225a65b3656cc3c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
bump version number
- Commit:
5328fb4f56aa32f852d1c88126fd5756bb9cec9e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
CHANGES for 0.72
- Commit:
1f4d51624ce2a28d6cd8385d3ec7bef9975db99f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
small grammar and accuracy fixes in a comment