|
26abd4a4
|
2021-06-18T08:27:32
|
|
typo
|
|
|
296304f3
|
2021-06-18T08:26:00
|
|
document how profiling works
|
|
|
7a6dddae
|
2021-06-18T08:06:21
|
|
make it possible to profile gotweb; tracey had the same diff
|
|
|
245c7240
|
2021-06-17T16:36:47
|
|
unveil gmon.out if gotweb is being profiled
ok tracey
|
|
|
9ec58fff
|
2021-06-17T15:41:49
|
|
use socketpair(2) instead of pipe(2) for bi-directional communication
On Linux, pipes returned from pipe(2) only work in one direction.
This broke 'got clone' over ssh in the -portable version because
got-fetch-pack assumes it can use its fetchfd for both reading and writing.
I wrote a complicated diff to use two pipe(2) calls instead of one, but
millert suggested a simpler solution: Use socketpair(2) instead of pipe(2).
ok millert jrick tracey
|
|
8e09a168
|
2021-06-17T14:26:45
|
|
fix hang in commit regress test. ok stsp
|
|
|
fdf3c2d3
|
2021-06-17T09:01:05
|
|
use Patience diff for merging during cherrypick/backout/histedit/rebase
This has been shown to prevent mis-merges in some cases. It's probably
not a final solution. We should look at what Git's "recursive merge"
is doing and implement something similar.
Keep using Myers during update/unstage. The advantage of Myers is that
it produces smaller conflict chunks, and there are no known cases of
mis-merges which affect update/unstage.
|
|
|
1d0f4054
|
2021-06-17T08:56:43
|
|
check for close(2) error in got_repo_close() and propagate errors up
ok tracey
|
|
|
991ff1aa
|
2021-06-15T22:16:22
|
|
close all opened repo->gitdir_fd's and set open_repo static. ok naddy (with static change)
|
|
|
0d15f6dc
|
2021-06-13T17:03:59
|
|
in addblk(), only read data into buffer1 if we will compare it to buffer2
suggested by and ok naddy@
|
|
|
68bdcdc2
|
2021-06-11T17:10:50
|
|
addblk() may seek in its input file; reposition the file pointer afterwards
|
|
|
a893025f
|
2021-06-11T17:02:57
|
|
addblk: iterate over the correct number of entries after growing the array
ok naddy
|
|
|
e89540a9
|
2021-06-11T17:02:13
|
|
addblk: be more careful about expanding the blocks array when we outgrow it
fixes + ok naddy
|
|
|
51a494da
|
2021-06-11T17:00:02
|
|
check a block's hash as well as its length before expensive comparisons
suggested by + ok naddy, and Ori agrees
|
|
|
282f42e5
|
2021-06-05T09:51:24
|
|
remove stray debug print which was accidentally committed
|
|
|
0c9eeee2
|
2021-06-05T09:32:56
|
|
avoid uninitialized error being returned from got_repo_get_packfile_info()
|
|
|
3b9e6fcf
|
2021-06-05T09:28:54
|
|
simplify deflate checksumming code; fixes errors with upcoming 'gotadmin pack'
tweak + ok naddy
|
|
|
54d5be07
|
2021-06-03T13:12:58
|
|
fix unrelated changes being merged by got cherrypick/backout/rebase/histedit
This was a long-standing and very annoying bug.
The two xfail tests in the cherrypick test suite are passing now.
|
|
|
1af628f4
|
2021-06-03T12:38:42
|
|
switch merge_file_cb() to using merge_file() instead of merge_blob()
|
|
|
eec2f5a9
|
2021-06-03T12:14:35
|
|
decouple merge_file() parameters for 2nd derived version and merge target file
|
|
|
dc082d4a
|
2021-06-03T11:57:58
|
|
in merge_file(), remove allocation of a base_path which is unused
|
|
|
07bb0f93
|
2021-06-02T09:26:42
|
|
move merge_file()'s f_deriv parameter next to the f_orig parameter
|
|
|
db590691
|
2021-06-02T09:24:51
|
|
make merge_file() accept FILEs instead of paths for orig and deriv inputs
|
|
|
67a66647
|
2021-05-31T09:20:56
|
|
refactor merge_file() such that it no longer requires a blob object parameter
|
|
|
3cd22b21
|
2021-05-31T09:19:13
|
|
add an xfail test for a cherrypick bug where unrelated changes get merged
The test case I am using here is a bit large but I could not yet find a way
to make it smaller. If someone knows a smaller test case, please let me know.
naddy caught a small bug in the new test code I had written, thanks!
|
|
f2705486
|
2021-05-30T15:37:51
|
|
dial_git(): fix memory leak and simplify
Simplify dial_git() by formatting the initial Git protocol packet
with dprintf, suggested by millert, and stop leaking an asprintf
buffer.
ok stsp
|
|
|
57c18198
|
2021-05-24T18:25:19
|
|
validate reference names in open_ref()
This catches invalid reference names passed to 'got ref -l' and will also be
needed to validate reference names passed to a future 'gotadmin pack' command.
ok naddy@
|
|
|
91b40e30
|
2021-05-21T20:20:28
|
|
add checksum support to got_deflate_to_file()
This will eventually be used by 'gotadmin pack'.
Checksum init and finalization will need to be done by the caller
since many objects will be written out in compressed form while
we are computing checksums across the entire pack file.
ok millert, naddy
|
|
|
af8a5c4a
|
2021-05-21T20:16:17
|
|
plug a memory leak in got_ref_list_free()
Code which inserts a reference into a reflist passes ownership of
this reference to the list. However, got_ref_list_free() never
closed such references, which resulted in a memory leak.
ok tracey
|
|
|
9069347b
|
2021-05-20T09:58:35
|
|
improve error reporting when delta application fails
|
|
|
dbbf4a5f
|
2021-05-20T09:51:59
|
|
allow got_deltify_free(NULL); will be needed by 'gotadmin pack'
|
|
|
e5ad7365
|
2021-05-20T09:51:59
|
|
fix file descriptor leak when got-read-object returns a raw object
|
|
|
932dbee7
|
2021-05-19T13:58:22
|
|
fix wrong function name in error message; pointed out by Mikolaj Kucharski
|
|
|
a486b62b
|
2021-05-18T13:17:12
|
|
ignore SIGWINCH while polling in the main process
Avoids an error where tog(1) would exit with "poll: Interrupted system call"
while the terminal window was being resized.
ok millert
|
|
|
a3af57b8
|
2021-05-10T11:26:06
|
|
remove unused worktree-related includes from lib/repository.c
|
|
|
6648f956
|
2021-04-26T19:01:13
|
|
properly render an error page instead off returning 500. bug reported by Miniontoby via irc
|
|
|
91c82228
|
2021-04-18T11:50:01
|
|
got.1: make double-quotes appear in the rendered man page as intended
Patch by Nam Nguyen
|
|
|
cce854ad
|
2021-04-13T09:51:56
|
|
add tests for the bug fixed in commit 1fee9f40e2ed335d4ec8899954b59b43990b97c3
one of these tests is still failing; there is another edge case left to fix
|
|
|
1fee9f40
|
2021-04-13T08:28:24
|
|
fix 3-way merge of files which lack a final \n
problem found by jrick
ok millert
|
|
|
6c19a3dc
|
2021-04-10T13:37:59
|
|
add missing comma in SEE ALSO section of git-repository(5)
|
|
|
0a79feb1
|
2021-04-10T13:35:23
|
|
Xr gotadmin(1)
|
|
|
20662ea0
|
2021-04-10T13:31:30
|
|
introduce 'gotadmin info'
|
|
|
762d73f4
|
2021-04-10T13:13:56
|
|
introduce got_object_open_loose_fd() for library-internal use
|
|
|
509c9973
|
2021-04-10T13:11:17
|
|
add got_packidx_get_packfile_path() for library-internal use
|
|
|
c6e8a826
|
2021-04-05T17:55:12
|
|
do not update symlinks which are already up-to-date
This fixes spurious 'U' notifications for symlinks during 'got update'
that occurred even when the work tree was fully up-to-date.
Observed on a work tree of the FreeBSD src repo and reproduced in our
test suite by adding a no-op update at the end of a test which deals
with updating symlinks.
|
|
|
0f58026f
|
2021-04-05T17:51:07
|
|
add a missing STATUS_EXISTS notification in update_blob()
|
|
|
6de13529
|
2021-04-05T11:53:25
|
|
bump version number
|
|
|
d34046a7
|
2021-04-05T11:52:46
|
|
CHANGES for 0.52
|
|
|
7495ec13
|
2021-04-04T14:24:39
|
|
fix open file descriptor leak in error path of read_object_header_privsep()
|
|
1795b260
|
2021-04-02T23:31:08
|
|
Fix "mandoc -T lint" WARNINGS and ERRORS, add missing word
|
|
|
1a1242a9
|
2021-04-01T19:28:57
|
|
diff: reduce duplicate code
Condense error checking to reduce a future diff moving those lines around;
this pattern is already used in other parts of the tree.
fine stsp
ok tracey
|
|
|
ac62b712
|
2021-03-30T14:50:44
|
|
when reading a pack index byte-swap fields at compile-time where possible
suggested by mpi@ ages ago
|
|
|
6c414261
|
2021-03-30T01:26:42
|
|
cap pack file cache size at 1/8 of the current open file desciptor limit
|
|
|
61303e6e
|
2021-03-30T01:22:29
|
|
fix off-by-one in got_repo_cache_pack()
|
|
|
159a21e5
|
2021-03-30T00:48:38
|
|
increase pack index cache size from 16 to 64 to improve performance
This can make a huge difference on repositories which contain more than
16 pack files, at the expense of additional open file handles.
My test case was a ports.git repository with > 60 pack files (these
accumulate due to 'got fetch', and 'git repack -a' would condense them).
With cache size 16 'got update' in /usr/ports took more than 60 seconds.
With cache size 64 the same command took less than 5 seconds.
The root cause is probably that mapping and unmapping large files over
and over again is expensive on OpenBSD.
|
|
|
4d9042b3
|
2021-03-24T14:17:56
|
|
fix error checking in dial_ssh()
|
|
|
46be108f
|
2021-03-23T19:07:39
|
|
bump version number
|
|
|
7674972a
|
2021-03-23T19:04:02
|
|
CHANGES for 0.51
|
|
|
4cc1f028
|
2021-03-23T15:01:29
|
|
fix use of an uninitialized stat buffer during work tree status crawl
found by naddy
ok naddy jrick
|
|
|
9e822917
|
2021-03-23T11:39:17
|
|
rebase/histedit -l: error out if no backups for the requested branch exist
|
|
|
22403ab7
|
2021-03-22T16:20:51
|
|
deltify.c: explicitly include <endian.h> for be64toh()
|
|
|
6deaf236
|
2021-03-22T11:26:54
|
|
bump version number
|
|
|
f5999cde
|
2021-03-22T11:26:13
|
|
CHANGES for 0.50
|
|
|
5df0db63
|
2021-03-22T11:25:43
|
|
sync dist file list
|
|
|
e3199de8
|
2021-03-21T19:09:35
|
|
fix strftime return value check; found by jrick
|
|
|
e600f124
|
2021-03-21T19:09:35
|
|
ensure that old commits remain referenced after rebase and histedit
Create automatic "backup" references which ensure that objects from
the pre-rebase or pre-histedit state remain in the repository.
A new -l option for 'got rebase' and 'got histedit' lists old commits.
This makes it easier to recover from botched rebase or histedit operations.
Removal of such objects currently requires got ref -d and git-gc.
This will be made more convenient in the future.
testing and ok jrick
|
|
|
601aba22
|
2021-03-21T19:08:46
|
|
improve got ref -d documentation: mention that objects won't be deleted
ok jrick
|
|
ec6d1a36
|
2021-03-21T18:49:57
|
|
Fix strftime(3) short buffer checks
strftime(3) returns 0 if the buffer was too short to write the
complete string (including NUL) and will never return more than
maxsize-1.
ok stsp
|
|
|
4e20a648
|
2021-03-21T16:39:29
|
|
Clarify log -x is inclusive
ok stsp
|
|
|
59d1e4a0
|
2021-03-10T22:49:22
|
|
implement raw object data access; this will be required for packing
|
|
|
8704c7ce
|
2021-03-10T22:49:21
|
|
add a simple deltify test
|
|
|
69aa0e90
|
2021-03-10T22:49:21
|
|
substantial rewrite of deltify.c; operate on plain files only
|
|
|
5788893e
|
2021-03-10T22:49:21
|
|
fix off-by-one error in delta length; from ori
git9 commit fbb2fb7c87d8edf58e22c84f575853dc9de79ac4
|
|
|
f364801d
|
2021-03-10T22:49:21
|
|
first pass over deltify.c: adapt coding style and data types; make it compile
|
|
|
2a0e67f7
|
2021-03-10T22:49:21
|
|
Ori has authorized a licence change to OpenBSD's license template
|
|
|
56e7a15f
|
2021-03-10T22:49:21
|
|
add deltify.c, unmodified from git9, with license header added
|
|
|
bc62ede8
|
2021-02-26T17:31:35
|
|
use Myers diff instead of Patience diff when merging files with diff3
Myers diff tends to divide files into smaller diff chunks, while Patience
diff attemps to maximize the size of diff chunks. Smaller diffs chunks
generally result in a more managable presentation of merge conflicts.
|
|
|
9f8221f0
|
2021-02-11T07:46:18
|
|
happy new year
|
|
|
83b4cfd8
|
2021-02-11T07:36:55
|
|
bump version number
|
|
|
2664411d
|
2021-02-11T07:32:48
|
|
CHANGES for 0.49
|
|
|
34d4e04c
|
2021-02-08T13:52:37
|
|
include remote branches in the output of 'got branch -l'
This makes it easier to discover the existence of copies of remote
branches in the local repository, and fixes a missing asterisk in
'got branch -l' while the work tree is switched to a remote branch.
Prompted by feedback from helg, thanks!
|
|
|
8ea5c997
|
2021-02-07T20:55:39
|
|
got info: fix a pasto in an error message
|
|
|
9dbd8627
|
2021-02-04T11:11:25
|
|
tolerate tag objects which lack tagger timestamp information
Fixes interop with repos such as git://github.com/steveicarus/iverilog.git
Found by + ok naddy
|
|
|
df3ed485
|
2021-01-31T11:57:10
|
|
simplify the error message shown when 'got rebase' has nothing to do
|
|
|
28cf319f
|
2021-01-28T17:06:22
|
|
add 'got commit -F' option to commit with a log message stored in a file
To avoid accidents commit -F opens the prepared log message in an editor
so it can be reviewed before the commit is created.
For non-interactive use the -N option is required in addition to -F.
ok millert@
|
|
|
a5a46be2
|
2021-01-27T22:20:52
|
|
in 'got clone', allow -l together with -q, for consistency with 'got fetch'
|
|
|
7b4f1fcb
|
2021-01-27T22:12:42
|
|
in got.1 fix a 'got branch' example which used obsolete syntax
|
|
|
c0c4acc8
|
2021-01-24T18:55:17
|
|
tog: fix behaviour when 'n' is pressed before a search was started with '/'
reported by + ok naddy
|
|
|
6e210706
|
2021-01-22T23:49:46
|
|
implicitly mark all files in work tree as up-to-date after 'got integrate'
Avoids having to run 'got update' for no good reason after 'got integrate'.
The same change was made recently for both rebase and histedit in
commit a615e0e7796ea1103a6e0d4b5dbb6134597886660 and we forgot about histedit.
|
|
|
455f928e
|
2021-01-22T22:06:21
|
|
bump version number
|
|
|
8c6f70b8
|
2021-01-22T22:02:34
|
|
CHANGES for 0.48
|
|
|
60e40e95
|
2021-01-22T21:53:05
|
|
close file handles before freeing other things in got_worktree_close()
The work tree's path needs to be valid while constructing error messages.
|
|
|
e7abd6b6
|
2021-01-22T21:47:37
|
|
fix missing close(2) error check in got_worktree_close()
|
|
|
08578a35
|
2021-01-22T11:05:05
|
|
make close(2) failure checks consistent; check 'close() == -1' everywhere
ok millert, naddy
|
|
|
56b63ca4
|
2021-01-22T11:04:47
|
|
make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere
ok millert, naddy
|
|
|
a6b21eef
|
2021-01-21T19:10:08
|
|
add missing braces around multi-line if-statement in got_worktree_close()
|
|
|
a06ff56f
|
2021-01-21T18:33:50
|
|
fix a use after free()
ok jrick stsp
|
|
|
56d0a753
|
2021-01-20T21:07:46
|
|
let 'got clone' write gitconfig directives that match the generated got.conf
|
|
|
1fddf795
|
2021-01-20T20:33:17
|
|
fix 'tog blame' segfault upon empty input file; reported by + ok naddy
|
|
|
d51387a0
|
2021-01-19T11:11:16
|
|
expand coverage of test_update_single_file: test file deletion during update
|