Game of Trees Repos

Commits

Commit:: 030daac821622c8495676bc5210fb7784c7ae78f
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Sep 25 10:26:13 2021 UTC

fix some integers that had a slightly wrong type; patch by Omar Polo

diff | patch | tree

Commit:: 50127d69d134221cbcaa9ca3e173dceac051952c
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Sep 25 10:24:15 2021 UTC

add 'static' qualifier to local functions in got-read-pack; patch by Omar Polo

diff | patch | tree

Commit:: fda3525ecfaa5f1d603ab52254172b68ad177ed1
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Sep 25 10:23:12 2021 UTC

mark some function parameters as 'const', as they should be; patch by Omar Polo

diff | patch | tree

Commit:: f6764181d7e0fc68673b90cbc93d6064509d0bd7
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 24 21:52:59 2021 UTC

fix 'got update' of an added + obstructed file When 'got update' tried to add a new file to the work tree and this file was obstructed by, say, a directory on disk, the update failed: $ got update ? new got: new: Is a directory $ And the work tree was not updated. With this commit this situation is properly detected as an obstruction and the update succeeds: $ got update ~ new Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc File paths obstructed by a non-regular file: 1 $ Extend a corresponding test case to cover this issue. ok tracey

diff | patch | tree

Commit:: f365d76274ee1ae2b57225686a0733176fc4bfb2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 24 20:50:54 2021 UTC

stop using the term 'obstructed' ambiguously in the got.1 man page Specifically, obstructed files are versioned files which should be on disk but have been replaced on disk by a non-regular file (e.g. by a directory). The man page used the phrase "deletion was obstructed" which is unrelated to the above concept and can be expressed as "deletion was prevented" instead.

diff | patch | tree

Commit:: 1acd48bccbe935fbbd39c3387b92b0fb6aaf444f
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 24 20:47:39 2021 UTC

stop caring about obstructed versioned files in 'got merge' Tyring to write a test to cover this case I found that obstructed files are (correctly) detected as local modifications in the work tree. Thus they trigger the pre-condition check for local modications and 'got merge' will not even start to do any work in the presence of obstructed files.

diff | patch | tree

Commit:: 793fcac3d46049fc9505ccf53b23af592bfdb963
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 24 20:14:09 2021 UTC

plug memory leak in got_worktree_merge_in_progress(); spotted by tracey

diff | patch | tree

Commit:: a6a8f8bbb699f0f18ebd74c5aa76f6ceb2221f8d
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 24 20:05:26 2021 UTC

add a test for 'got merge' which covers a no-op merge situation

diff | patch | tree

Commit:: f259c4c18277237ced1043033cb1af739f73db28
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 24 19:55:02 2021 UTC

add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey

diff | patch | tree

Commit:: 9f98ca0596877b609e3785a877d36dca6c774c24
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 24 19:47:15 2021 UTC

show parent commit IDs of merge commits in the tog diff view ok tracey

diff | patch | tree

Commit:: 0e5df9843b907e2f3bb8bae341f4ac0d5762346a
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Sep 23 18:03:54 2021 UTC

update TODO note about HTTP; libtls will more likely be used from dial.c

diff | patch | tree

Commit:: 3af9de885a0d557ecb7810536cd451f3c320fa68
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 22 13:32:37 2021 UTC

fix 'got send' with tree objects which contain symlinks; reported by Omar

diff | patch | tree

Commit:: ad324bf53a11587dc227a2c00b65020595aa18dc
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 21 20:27:45 2021 UTC

fix histedit_no_op test which was failing randomly A no-op replayed history ends up having exactly the same commit IDs if all commits are created at roughly the same moment in time. There are no content changes involved so if commit timestamps do not differ then commit hashes will be the same. In which case there is no fork in history for 'got histedit -l' to display, yet the test was always expecting a fork in history to be displayed. Update the test to take this issue into account. The test will now pass no matter which result is produced by the histedit operation. Problem found by Lucas who observed that this test was randomly failing. Patch also provided by Lucas.

diff | patch | tree

Commit:: 34c3415fac1e6f7bb8fb803417020063834c6112
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 21 20:17:54 2021 UTC

update README blurb about 'ssh 127.0.0.1' requirement for regress tests

diff | patch | tree

Commit:: 3da8ef855d7d7b3da96a9f1cba55df276e112f11
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 21 11:05:06 2021 UTC

tog: use sched_yield(2) instead of pthread_yield(3) for portability pthread_yield(3) is an optional POSIX 2001 extension while sched_yield(2) is part of POSIX 2008. On OpenBSD they are actually equivalent, albeit not documented as such. Using sched_yield(2) helps the -portable version. Patch by Quentin Rameau

diff | patch | tree

Commit:: 6062e8ea890c053733ec0ad3387a40da18a45cda
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 21 10:59:29 2021 UTC

tog: document why _XOPEN_SOURCE_EXTENDED is set and don't undefine it

diff | patch | tree

Commit:: ac372b601e0be8eb794f071912ddb1efc81ea8a8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 15 17:11:46 2021 UTC

'got status' does not have a -q option; remove it from got.1 synopsis

diff | patch | tree

Commit:: df7dea6e70ae149a51b80d537544c007bdb03258
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 15 17:08:37 2021 UTC

add -S option to 'got status' synopsis in got.1 man page

diff | patch | tree

Commit:: 7dd7d39b1e5196830234690ea1db776cf036a4bf
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 15 09:59:27 2021 UTC

bump version number

diff | patch | tree

Commit:: 4a87b3701d0c943155b64f698e7d9db32ba57fbb
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 15 09:55:18 2021 UTC

CHANGES for 0.60

diff | patch | tree

Commit:: 67d7451ca0b909687a2689243077b8d7edb65102
From:: Christian Weisgerber <naddy@mips.inka.de>
Date:: Wed Sep 15 08:29:53 2021 UTC

shell code fixes Escape sequences are not handled by every echo(1), e.g. not on FreeBSD. '?' is a glob character and must be quoted. '!' is not a shell meta character. ok tracey stsp

diff | patch | tree

Commit:: f0fd0aafb69cafd7c84dd294cffda4b3c1d6144a
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 19:21:59 2021 UTC

make 'got send' regression tests run 'git fsck' on all involved repositories

diff | patch | tree

Commit:: c2105d002a73e60c6f3194dd96a1a0b09eb34e08
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 19:02:10 2021 UTC

fix another instance of 'got send' sending branches the server already has

diff | patch | tree

Commit:: 13364f2d81ad613f67036d34a5181ff1cb1ecf3c
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 17:39:21 2021 UTC

bump version number

diff | patch | tree

Commit:: 47975383a20a6f2928b43b33b8a7805c7cc1fc8d
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 17:27:43 2021 UTC

CHANGES for 0.59

diff | patch | tree

More ↓