Commits
- Commit:
68e8cedbff75686437a3d71b0c265fb66cbbbd75
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to show just one tag with 'got tag -l'
suggested by jrick
ok jrick jamsek
- Commit:
19a6a6b5eea7ed2df9eaaba2364d18ee05678ddd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd() out of lib/diff.c again
ok tracey
- Commit:
00a8878e94dced1dd4053bf9b61e8b8c16f59629
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd out of blame_open ok stsp@ jrick@
- Commit:
acb9e3ea2ed831226f75eb7606ecd06a0711b131
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
pass the correct file to fdopen(); ok tracey
- Commit:
f9bba04a89d0b706fe1b4d95cfe16b75b70097e1
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix missed dup in open_blob per stsp@
- Commit:
f4ae6ddb59a1edbd016ad7f0e27c2599f8966e19
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd out of open_blob. ok stsp@
- Commit:
ec2b23c5d2570888a1d83ce2e8eee5a90eeff695
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement support for commit coloring in got-read-pack for speed
ok op, tracey
- Commit:
4d27f680443116b3694af5348801dd446b091cff
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: echo count prefix when entering compound key maps
like less(1), echo the digits as they're typed.
suggested by and ok op@ stsp@
- Commit:
19dd85cbe25c418975d46e00cc13b48e26488715
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: handle git-style diffs for the 3-way merge too
tweak and ok stsp@
- Commit:
8afec5d5388b965430c12e3405765ceb552faefa
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
handle blob ids without corresponding blob ids
ok stsp@
- Commit:
0c6f49baf2b43adf1cd027050d27fc32ef8454da
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
build with -Wwrite-strings
Throwing this into the mix for a while, we can always get rid of it
again if it becomes annoying. No objections from stsp@
- 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@