Log

Author Commit Date CI Message
Stefan Sperling 197088a4 2021-12-27T05:20:04 whitespace
Stefan Sperling 8a4f8535 2021-12-27T05:19:52 fix NULL dereference in 'got clone' if server sends an empty pack file
Stefan Sperling 46ea77db 2021-12-20T16:18:41 sort paths in got log -Pp and tog's diff view the same way as in the diff reported by and fix confirmed by naddy
Stefan Sperling 487cd7d2 2021-12-17T22:38:55 make tog searches start from the current position in all views ok naddy@
Stefan Sperling 4a55b231 2021-12-09T16:10:25 ignore the return value of closefrom(2); patch by Anna a.k.a. CyberTailor millert@ suggests that this check is not needed, and that ideally we should be using close-on-exec instead. I will look into this, but in the meantime this change will help -portable: https://bugs.gentoo.org/828003
Stefan Sperling 5a5ede53 2021-12-09T15:03:48 let new 'tog log' searches start out from the currently selected commit ok naddy tracey
Stefan Sperling f6f4c787 2021-11-23T19:12:49 sync files from diff.git f1dbec24f9a9553e22659f6c592c91e96221f6b9
Stefan Sperling 88e107c9 2021-11-23T15:39:57 bump version number
Stefan Sperling 9fe19ceb 2021-11-23T14:54:48 CHANGES for 0.64
Thomas Adam 10b394ac 2021-11-23T12:52:59 regress: make merge.sh more POSIXy Don't use '==' for equality matching in sh, as this won't work across all shells. ok @naddy
Thomas Adam 566e0ee7 2021-11-22T22:32:25 regress: make test operands POSIX compliant Since the interpreter for the regress shell scripts are using /bin/sh this will usually imply some level of POSIX compliance (that isn't bash-specific, for instance). Some systems use dash as their sh shell and as such is stricter POSIX compliance. To help -portable, make the shell test checks use a single '=' for equality, rather than '=='.
Stefan Sperling 1a37462f 2021-11-22T18:28:05 sync dist file list
Stefan Sperling 07a065fe 2021-11-20T21:22:53 switch tog ref view's sort order command key to "o" instead of "s" The letter "o" does not overlap with existing options of 'got ref' and is also used by mutt(1) for this purpose.
Stefan Sperling f76670f0 2021-11-20T11:33:31 add got branch -t option to sort listed branches by modification time
Stefan Sperling 42864987 2021-11-20T11:14:44 fall back to comparison by name when refs have the same timestamp This fixes an issue where some references were missing from lists of references sorted by timestamp.
Stefan Sperling 0f104432 2021-11-20T11:05:27 add got ref -t option to sort listed references by modification time
Stefan Sperling 50617b77 2021-11-20T10:41:38 make tog use got_reflist_sort() instead of reloading refs while sorting them
Stefan Sperling 2d497592 2021-11-20T10:40:33 implement got_reflist_sort() which sorts a ref list in-place
Stefan Sperling 0309152a 2021-11-20T10:39:04 fix uninitialized error from got_ref_cmp_by_commit_timestamp_descending()
Stefan Sperling 7f66531d 2021-11-16T14:33:26 allow sorting references by timestamp in tog
Stefan Sperling 0e039681 2021-11-15T17:00:36 preverse binary files during updates and merges
Stefan Sperling 7d69d862 2021-11-15T15:18:40 let gotadmin find the repository automatically if invoked in a work tree Move a small amount of code from worktree.c to a new file worktree_open.c, which contains everything required to open and close a work tree and inspect some of its basic parameters. This can be used by gotadmin. ok tracey
Stefan Sperling 7cc76137 2021-11-14T10:34:31 gotweb does not actually use anything from worktree.c or fileindex.c
Klemens Nanni 4683a10b 2021-11-04T13:16:06 Fix mandoc HTML rendering for command aliases Replace hand-rolled parentheses with the proper mdoc(7) macro, otherwise the closing ")" ends up inside the command description. Reported by Josh Rickmar, thanks!
Stefan Sperling 2af61735 2021-11-03T22:13:50 document new 'got rebase' behaviour when commits do not need to be rebased
Josh Rickmar 3d42b266 2021-11-03T21:42:33 switch branches during noop rebases Always update to the specified branch even if the branch is already rebased (no commits needed to be rebased, and the branch does not need a fast forward). With the old behavior of erroring and staying on the current branch, I sometimes found myself ignoring the error message, treating it as information and assuming the branch update, and later on committing on top of origin/main instead of the main branch. feedback and ok stsp
Christian Weisgerber 47a90748 2021-10-27T15:23:59 remove unused variables to fix LLVM 13 warnings; ok stsp
Stefan Sperling 22edbce7 2021-10-24T09:41:04 use up to 128 delta chain elements again; creates smaller packs at same speed
Stefan Sperling 4f4d853e 2021-10-24T09:41:04 try only 3 delta base candidates instead of 10 to speed up packing Tests by kn, thomas_adam and myself made on various repositories indicate that 3 is a good choice. Tyring 10 deltas is much slower and does not result in significantly smaller pack files.
Stefan Sperling a9e66726 2021-10-17T17:46:49 bump version number
Stefan Sperling f1028e98 2021-10-17T17:45:32 changes for 0.63
Stefan Sperling 15a5c949 2021-10-17T14:12:46 set oldo.to in diff3.c's duplicate() even if the file contains no newlines
Stefan Sperling 8383a50b 2021-10-17T14:11:32 always initialize output parameter "n" of get_line() in diff3.c
Stefan Sperling 02ffd0d5 2021-10-17T13:51:52 tog: add Ctrl-n/Ctrl-p shortcuts scrolling one line down/up; patch by Omar Polo
Christian Weisgerber 4f18c400 2021-10-16T15:01:42 fix another segfault in edscript() Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1. ok stsp
Stefan Sperling 92410079 2021-10-16T14:50:03 fix regression where 'got send -T' failed if same tag already exists on server Problem reported and fix tested by Omar Polo.
Stefan Sperling 2e3a6c3b 2021-10-16T10:38:27 bump version number
Stefan Sperling d89fbca5 2021-10-16T10:21:34 CHANGES for 0.62
Stefan Sperling 8347f8e7 2021-10-15T17:17:52 plug memory leak in an error path of read_packed_object()
Stefan Sperling 07965a0d 2021-10-15T17:08:54 fix wrong function names in error messages from got-index-pack.c
Stefan Sperling 802c0f04 2021-10-15T17:05:12 make 'gotadmin indexpack' unveil the repository read/write, not read-only
Christian Weisgerber 0c82d267 2021-10-15T15:18:30 sync with OpenBSD parse.y Explicitly cast "char" to "unsigned char" when assigned to "int" to prevent sign extension from breaking comparions against EOF or passing invalid arguments to ctype functions.
Stefan Sperling a319ca8c 2021-10-15T10:36:12 move encode_delta() in pack_create.c to eliminate a forward declaration
Stefan Sperling 74881701 2021-10-15T10:34:44 while packing, store encoded deltas in a temporary file instead of in memory
Stefan Sperling dc20764a 2021-10-15T09:30:29 limit delta chain length in newly created pack files to 32 deltas Our former limit was 128 which is fairly high. Git uses 50 by default. A smaller limit results in slightly larger pack files but makes both packing and unpacking faster.
Stefan Sperling 94dac27c 2021-10-15T09:24:56 raw object blocksize and read buffer were unused; remove them
Stefan Sperling 284e7663 2021-10-15T09:21:46 remove unused internal raw object API functions
Stefan Sperling d3c116bf 2021-10-15T09:10:14 cache raw objects in order to speed up gotadmin pack
Stefan Sperling cc7a354a 2021-10-15T07:15:00 reuse temporary files which were not used by got_object_raw_open()
Stefan Sperling f8eebdd4 2021-10-15T07:14:24 add missing calls to got_repo_close() in gotadmin.c
Stefan Sperling e65c7410 2021-10-14T20:50:01 add missing error checks in got_object_raw_open()
Stefan Sperling 600b755e 2021-10-14T20:30:26 avoid opening delta base objects in genpack() just to find their size
Christian Weisgerber b4e0802f 2021-10-14T18:52:27 FreeBSD's ed(1) does not accept "0i"; use the equivalent "1i" instead
Stefan Sperling 08347b73 2021-10-14T17:27:26 encode deltas in temporary files to avoid high memory usage
Stefan Sperling c5c77d29 2021-10-14T17:20:44 make got-build-regress.sh run tests a second time with GOT_TEST_PACK=1
Stefan Sperling 5df018ff 2021-10-14T16:03:22 rework murmurhash2() to avoid potential unaligned memory access pointed out by naddy@ ok millert@
Stefan Sperling 1d19226a 2021-10-13T18:48:15 fix two more error strings in pack_create.c using the wrong function name
Stefan Sperling 2d467c6d 2021-10-13T18:07:29 fix wrong function in error string of emitdelta()
Stefan Sperling f8b19efd 2021-10-13T11:09:15 use RB_TREE instead of STAILQ to manage packindex bloom filters; much faster
Stefan Sperling fc75ac9d 2021-10-13T10:35:49 sync dist file list
Stefan Sperling 8f2ca62d 2021-10-13T10:34:06 do not skip ignored directories in 'got status' if they contain tracked files Fixes regression introduced by commit 41f061b2f459318f3738f59d7676efccc4beb344 where tracked files inside an ignored directory were reported as missing.
Stefan Sperling b343c297 2021-10-11T18:54:11 use a bloom filter to avoid pointless pack index searches
Stefan Sperling 7a0b1068 2021-10-11T18:54:08 fix pack index cache element rotation; keep often used entries near the front
Stefan Sperling 10a623df 2021-10-11T18:38:33 sort and de-duplicate work tree path command line arguments This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@
Stefan Sperling 90de04bc 2021-10-11T18:32:16 fix a segfault in edscript() introduced by my previous commit Found by our cherrypick regression tests.
Stefan Sperling f10244c0 2021-10-11T18:25:11 fix merging of files which contain a dot on a line by itself Annoying bug which we inherited from OpenRCS which inherited it from OpenBSD's diff3 program. ok tracey millert
Stefan Sperling 2c9e323b 2021-10-10T19:26:26 speed up 'got histedit -l' and 'got rebase -l' Cache commit timestamps in struct got_reference in case we are sorting references by commit timestamp. This avoids opening and closing commits every time we compare two references with each other. ok thomas.adam
Stefan Sperling 51ed7429 2021-10-10T15:24:21 align 'diff -c' usage help with synopsis given in man page; suggested by naddy
Stefan Sperling 67b631c9 2021-10-10T15:22:14 implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@
Stefan Sperling 138e4f47 2021-10-09T19:47:15 display the requested object type when an object could not be found ok millert@
Stefan Sperling 8f83a264 2021-10-09T10:09:50 remove code which was setting up repo_path redundantly from cmd_diff()
Stefan Sperling 237cfda1 2021-10-08T22:34:25 make got_repo_match_object_id() filter tags by the requested object type Potentially this function could return objects of a type that was not requested. Problem found by code inspection. This change does not affect any of our existing tests.
Christian Weisgerber 8cb8da5b 2021-10-08T18:06:08 document "mg" as alias for the "merge" command
Stefan Sperling c1e86b1d 2021-10-08T11:53:05 add an xfail test for a bug in merging content with a dot on a line by itself
Stefan Sperling 09209b8a 2021-10-08T08:34:39 add test for merge result when lines are inserted at the top of a file Based on a patch by Omar Polo
Stefan Sperling aaef19b4 2021-10-08T08:33:30 sync files from diff.git 346d4986568ffbcfdc53cce45dd8a468535a68f2
Stefan Sperling e7ffb0b0 2021-10-07T21:13:05 add support for multiple path arguments to 'got diff' positive feedback from Omar and kn ok kn
Stefan Sperling f736d93a 2021-10-07T19:12:36 link to the FastCDC paper from deltify.c; suggested by Ori some time ago
Stefan Sperling 6eab69f7 2021-10-07T19:08:52 make the number of elements in deltify's geartab explicit
Klemens Nanni b06f0b74 2021-10-07T15:58:52 Ignore tags files OK stsp
Klemens Nanni fbceed27 2021-10-07T15:38:38 Provide lib/Makefile to enable tags file generation The root Makefile does not hook into lib/ via <bsd.subdir.mk> since it is not a program itself and thus gets included by all others. This means `make tags` skips lib/ and `make -C lib/ tags` does not know what to do; provide a minimal <bsd.lib.mk> stub and hook it up just for the "tags" such that *all* source is browsable via tags. See /usr/share/mk/bsd.README for details. Feedback stsp tb OK tb
Stefan Sperling e99d9267 2021-10-07T15:29:27 plug memory leaks in got-fetch-pack and got-send-pack ok naddy
Stefan Sperling dd088d95 2021-10-06T19:49:06 let 'got fetch' send all references to the server to avoid redundant downloads Problem reported by naddy. ok naddy
Klemens Nanni 0c079dbc 2021-10-06T06:32:07 Fix "mandoc -T lint -W style" nits
Klemens Nanni b13a4ebc 2021-10-06T06:25:16 Document command aliases in tmux(1) style, add tags for navigation Complete 95f394e8917def2c11ce292b3a8f804d261b1d12; reminder to look at gotadmin(1) from stsp, thanks.
Stefan Sperling 41f061b2 2021-10-05T14:06:02 ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick
Klemens Nanni 90e6e620 2021-10-04T17:07:46 Fix "mandoc -T lint -W style got/got.1" nits
Klemens Nanni 95f394e8 2021-10-04T17:05:33 Document command aliases in tmux(1) style, add tags for navigation This has the advantage of tags being located right by the full command; combined with tags ":tco" to search for the `co` alias will jump right to the `checkout` line, neatly showing everything without needing further navigation. tmux hint from Thomas Adam, thanks. OK stsp
Stefan Sperling 136be4cc 2021-10-03T22:07:59 update 'got merge' TODO item
Stefan Sperling 2b8ed9ec 2021-10-03T21:30:47 bump version number
Stefan Sperling 9d9e459f 2021-10-03T21:27:59 CHANGES for 0.61
Stefan Sperling c52bf7fe 2021-10-03T21:26:12 sync dist file list
Stefan Sperling 62da3196 2021-10-01T13:58:31 skip ignored directories during 'got status' disk crawl
Stefan Sperling b93c7142 2021-10-01T06:22:27 add histedit -e option which runs the 'edit' script command for every commit ok jrick
Stefan Sperling 78caff98 2021-09-30T08:24:01 explicitly set the default branch name after 'git init' in regress tests We need to do this because newer versions of Git support an arbitrary default branch name which can be set by users. We don't want tests to fail when this option is used. pointed out by Thomas Adam
Christian Weisgerber 5d8cbca3 2021-09-29T19:53:08 pull in a type fix from the OpenBSD parse.y template Original commit message by deraadt: (unsigned) means (unsigned int) which on ptrdiff_t or size_t or other larger types really is a range reduction... Almost any cast to (unsigned) is a bug.
Christian Weisgerber d683c314 2021-09-29T19:43:01 fix unsigned/signed char mismatch in parse.y
Stefan Sperling fa161f0b 2021-09-28T21:48:11 update a CAVEAT in got.1 now that 'got merge' exists
Stefan Sperling cd33da48 2021-09-28T21:39:34 interrupt 'got histedit' upon missing/unversioned/not-deleted files
Stefan Sperling 1fa49072 2021-09-28T21:30:53 interrupt 'got rebase' upon missing/unversioned/not-deleted files